diff --git a/data/data.go b/data/data.go
index 2566afa..7fed43d 100644
--- a/data/data.go
+++ b/data/data.go
@@ -46,7 +46,7 @@
 var config apid.ConfigService
 
 type dbMapInfo struct {
-	db *sql.DB
+	db     *sql.DB
 	closed chan bool
 }
 
@@ -107,7 +107,7 @@
 	defer dbMapSync.Unlock()
 
 	dbm := dbMap[versionedID]
-	if dbm.db != nil {
+	if dbm != nil && dbm.db != nil {
 		if strings.EqualFold(config.GetString(logger.ConfigLevel), logrus.DebugLevel.String()) {
 			dbm.closed <- true
 		}
@@ -182,14 +182,14 @@
 		return
 	}
 	if strings.EqualFold(config.GetString(logger.ConfigLevel),
-			logrus.DebugLevel.String()) {
+		logrus.DebugLevel.String()) {
 		stoplogchan = logDBInfo(versionedID, db)
 	}
 
 	db.SetMaxOpenConns(config.GetInt(api.ConfigDBMaxConns))
 	db.SetMaxIdleConns(config.GetInt(api.ConfigDBIdleConns))
 	db.SetConnMaxLifetime(time.Duration(config.GetInt(api.ConfigDBConnsTimeout)) * time.Second)
-	dbInfo := dbMapInfo {db: db, closed: stoplogchan}
+	dbInfo := dbMapInfo{db: db, closed: stoplogchan}
 	dbMap[versionedID] = &dbInfo
 	return
 }
@@ -235,4 +235,3 @@
 	}()
 	return stop
 }
-