Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -1510,27 +1510,29 @@
     (debug:print-info 0 *default-log-port* "dbfile is "dbfile)
     (if dbfile
 	(let* ((am-server  (args:get-arg "-server"))
 	       (dbfile     (args:get-arg "-db"))
 	       (apath      *toppath*)
-	       (remdat     *remotedat*) ;; foundation for future fix
-	       (dbdat      (db:get-dbdat *dbstruct-db* apath dbfile))
-	       (db         (dbr:dbdat-db dbdat))
-	       (inmem      (dbr:dbdat-db dbdat))
-	       )
-	  ;; do a final sync here
-	  (debug:print-info 0 *default-log-port* "Doing final sync for "apath" "dbfile" at "(current-seconds))
-	  (db:sync-inmem->disk *dbstruct-db* apath dbfile force-sync: #t)
-	  ;; let's finalize here
-	  (debug:print-info 0 *default-log-port* "Finalizing db and inmem")
-	  (if (sqlite3:database? db)
-	      (sqlite3:finalize! db)
-	      (debug:print-info 0 *default-log-port* "in rmt:server-shutdown, db is not a database, not finalizing..."))
-	  (if (sqlite3:database? inmem)
-	      (sqlite3:finalize! inmem)
-	      (debug:print-info 0 *default-log-port* "in rmt:server-shutdown, inmem is not a database, not finalizing..."))
-	  (debug:print-info 0 *default-log-port* "Finalizing db and inmem complete")
+	       (remdat     *remotedat*)) ;; foundation for future fix
+	  (if *dbstruct-db*
+	      (let* ((dbdat      (db:get-dbdat *dbstruct-db* apath dbfile))
+		     (db         (dbr:dbdat-db dbdat))
+		     (inmem      (dbr:dbdat-db dbdat))
+		     )
+		;; do a final sync here
+		(debug:print-info 0 *default-log-port* "Doing final sync for "apath" "dbfile" at "(current-seconds))
+		(db:sync-inmem->disk *dbstruct-db* apath dbfile force-sync: #t)
+		;; let's finalize here
+		(debug:print-info 0 *default-log-port* "Finalizing db and inmem")
+		(if (sqlite3:database? db)
+		    (sqlite3:finalize! db)
+		    (debug:print-info 0 *default-log-port* "in rmt:server-shutdown, db is not a database, not finalizing..."))
+		(if (sqlite3:database? inmem)
+		    (sqlite3:finalize! inmem)
+		    (debug:print-info 0 *default-log-port* "in rmt:server-shutdown, inmem is not a database, not finalizing..."))
+		(debug:print-info 0 *default-log-port* "Finalizing db and inmem complete"))
+	      (debug:print-info 0 *default-log-port* "Db was never opened, no cleanup to do."))
 	  (if (not am-server)
 	      (debug:print-info 0 *default-log-port* "I am not a server, should NOT get here!")
 	      (if (string-match ".*/main.db$" dbfile)
 		  (let ((pkt-file (conc (get-pkts-dir *toppath*)
 					"/" (servdat-uuid *server-info*)