2 files changed, 6 insertions, 1 deletions
diff --git a/libgfortran/io/close.c b/libgfortran/io/close.c
index 9dcc1a3e60b..b6766ff37d5 100644
--- a/libgfortran/io/close.c
+++ b/libgfortran/io/close.c
@@ -102,6 +102,8 @@ st_close (st_parameter_close *clp)
         unlink (path);
 #endif
     }
-
+  else
+    generate_error (&clp->common, ERROR_BAD_OPTION,
+			    "Can't find specified UNIT in CLOSE");
   library_end ();
 }
diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
index e9697bb7ede..7a71ecef63b 100644
--- a/libgfortran/io/file_pos.c
+++ b/libgfortran/io/file_pos.c
@@ -340,6 +340,9 @@ st_flush (st_parameter_filepos *fpp)
       flush (u->s);
       unlock_unit (u);
     }
+  else
+    generate_error (&fpp->common, ERROR_BAD_OPTION,
+			"Can't find specified UNIT in FLUSH");
 
   library_end ();
 }