diff -r 48e45439fd9a -r 18c1225cfa1b librazor/uri-io.c
--- a/librazor/uri-io.c	Mon Jul 04 13:04:19 2016 +0100
+++ b/librazor/uri-io.c	Thu Jul 07 15:18:02 2016 +0100
@@ -1143,8 +1143,11 @@
 	if (path) {
 		razor_uri_destroy(&ru);
 		s = razor_file_mkdtemp_near(path, template, error);
-		retval = razor_path_to_uri(s);
-		free(s);
+		if (s) {
+			retval = razor_path_to_uri(s);
+			free(s);
+		} else
+			retval = NULL;
 		free(path);
 	} else {
 		entry = razor_uri_get_vtable_entry(ru.scheme);