diff --git a/Demo/Demo.bbj b/Demo/Demo.bbj
index b9eace8b..3a9399b4 100644
--- a/Demo/Demo.bbj
+++ b/Demo/Demo.bbj
@@ -86,7 +86,7 @@ return
 loadTables:
     lb_tbl!.removeAllItems()
     db$ = lb_db!.getSelectedItem()
-    sqlopen (1)db$
+    sqlopen (1,err=no_db)db$
     x$=sqltables(1)
     sqlclose(1)
     j=0
@@ -103,6 +103,10 @@ loadTables:
     lb_tbl!.selectIndex(j)
 return
     
+no_db:
+    a=msgbox("Database "+db$+" does not exist!",16,"Error")
+return
+    
 doQuery:
     db$ = lb_db!.getSelectedItem()
     tbl$ = lb_tbl!.getSelectedItem()