diff --git a/configuration/configuration.go b/configuration/configuration.go
index 074a78c..c4c1d42 100644
--- a/configuration/configuration.go
+++ b/configuration/configuration.go
@@ -540,7 +540,7 @@ func (c *ConfigurationData) setConfigDefaults() {
 	// prod-preview or prod
 	c.v.SetDefault(varEnvironment, "local")
 
-	c.v.SetDefault(varAuthKeysPath, "/token/keys")
+	c.v.SetDefault(varAuthKeysPath, "/api/token/keys")
 }
 
 // GetPostgresHost returns the postgres host as set via default, config file, or environment variable
diff --git a/main.go b/main.go
index aa83a92..a225ca9 100644
--- a/main.go
+++ b/main.go
@@ -25,6 +25,7 @@ import (
 	"github.com/goadesign/goa/middleware/gzip"
 	"github.com/goadesign/goa/middleware/security/jwt"
 	"github.com/jinzhu/gorm"
+	_ "github.com/lib/pq"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -72,9 +73,11 @@ func main() {
 	for {
 		db, err = gorm.Open("postgres", config.GetPostgresConfigString())
 		if err != nil {
-			db.Close()
 			log.Logger().Errorf("ERROR: Unable to open connection to database %v", err)
 			log.Logger().Infof("Retrying to connect in %v...", config.GetPostgresConnectionRetrySleep())
+			if db != nil {
+				db.Close()
+			}
 			time.Sleep(config.GetPostgresConnectionRetrySleep())
 		} else {
 			defer db.Close()