diff --git a/ChangeLog b/ChangeLog
index f1adc16..e0b061e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Thu Jun 16 21:19:37 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
 	* src/libmdb/data.c: Fix segmentation fault
 	* src/libmdb/write.c: Fix bug in handling certain 'jump tables'
+	* src/util/mdb-schema.c: Handle 'file not found' case
 
 Mon May  2 07:28:58 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
 	* include/mdbtools.h:
diff --git a/src/util/mdb-schema.c b/src/util/mdb-schema.c
index 3c8b2cb..012bb2f 100644
--- a/src/util/mdb-schema.c
+++ b/src/util/mdb-schema.c
@@ -62,18 +62,23 @@ main (int argc, char **argv)
 		}
 	}
  
- mdb_init();
+	mdb_init();
 
- /* open the database */
-
- mdb = mdb_open (argv[optind], MDB_NOFLAGS);
- if (argc - optind >= 2) {
-	if (!mdb_set_default_backend(mdb, argv[optind + 1])) {
-		fprintf(stderr,"Invalid backend type\n");
+	/* open the database */
+	mdb = mdb_open (argv[optind], MDB_NOFLAGS);
+	if (!mdb) {
+		fprintf(stderr, "Could not open file\n");
 		mdb_exit();
 		exit(1);
 	}
- }
+
+	if (argc - optind >= 2) {
+		if (!mdb_set_default_backend(mdb, argv[optind + 1])) {
+			fprintf(stderr, "Invalid backend type\n");
+			mdb_exit();
+			exit(1);
+		}
+	}
 
 	/* read the catalog */
  	if (!mdb_read_catalog (mdb, MDB_TABLE)) {