diff --git a/tools/backend_lib.h b/tools/backend_lib.h
index f54a4e14d4..ebebbb84c3 100644
--- a/tools/backend_lib.h
+++ b/tools/backend_lib.h
@@ -39,7 +39,7 @@ extern int process_result_template_upload_url_only(
 );
 
 extern int read_file(FILE*, char* buf);
-extern int read_filename(const char* path, char* buf);
+extern int read_filename(const char* path, char* buf, int len);
 
 extern void initialize_result(DB_RESULT&, DB_WORKUNIT&);
 extern int create_result(
diff --git a/tools/create_work.C b/tools/create_work.C
index 52c189c3be..f05a24cd90 100644
--- a/tools/create_work.C
+++ b/tools/create_work.C
@@ -186,9 +186,9 @@ int main(int argc, char** argv) {
     }
 
     //fprintf(stderr, "wu_template = %s\n", wu_template);
-    retval = read_filename(wu_template_file, wu_template);
+    retval = read_filename(wu_template_file, wu_template, sizeof(wu_template));
     if (retval) {
-        fprintf(stderr, "create_work: can't open WU template\n");
+        fprintf(stderr, "create_work: can't open WU template: %d\n", retval);
         exit(1);
     }
 
@@ -196,7 +196,7 @@ int main(int argc, char** argv) {
 
     retval = read_key_file(keyfile, key);
     if (retval) {
-        fprintf(stderr, "create_work: can't read key");
+        fprintf(stderr, "create_work: can't read key: %d", retval);
         exit(1);
     }