diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c2855652644e..dd38a894efc8 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-25  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/258335
+	* close.c (st_close): Add error when UNIT does not exist.
+	* file_position.c (st_flush): Add error when UNIT does not exist.
+
 2006-07-25  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR build/26188
diff --git a/libgfortran/io/close.c b/libgfortran/io/close.c
index 9dcc1a3e60b7..b6766ff37d51 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 e9697bb7ede6..7a71ecef63b7 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 ();
 }