1.1 --- a/librazor/uri-io.c	Mon Jul 04 13:04:19 2016 +0100
     1.2 +++ b/librazor/uri-io.c	Thu Jul 07 15:18:02 2016 +0100
     1.3 @@ -1143,8 +1143,11 @@
     1.4  	if (path) {
     1.5  		razor_uri_destroy(&ru);
     1.6  		s = razor_file_mkdtemp_near(path, template, error);
     1.7 -		retval = razor_path_to_uri(s);
     1.8 -		free(s);
     1.9 +		if (s) {
    1.10 +			retval = razor_path_to_uri(s);
    1.11 +			free(s);
    1.12 +		} else
    1.13 +			retval = NULL;
    1.14  		free(path);
    1.15  	} else {
    1.16  		entry = razor_uri_get_vtable_entry(ru.scheme);