diff --git a/config/config.go b/config/config.go
index bb6e722013..dc72ac2b56 100644
--- a/config/config.go
+++ b/config/config.go
@@ -42,8 +42,8 @@ var defaultMySQLConfigData = MySQLConfigData{
 
 var defaultServerConfigData = ServerConfigData{
 	Address: "127.0.0.1:8080",
-	Cert:    "./tools/kolide.crt",
-	Key:     "./tools/kolide.key",
+	Cert:    "./tools/osquery/kolide.crt",
+	Key:     "./tools/osquery/kolide.key",
 }
 
 var defaultAppConfigData = AppConfigData{
diff --git a/kolide.go b/kolide.go
index 64dd5c962e..9bf68b5ce4 100644
--- a/kolide.go
+++ b/kolide.go
@@ -151,10 +151,13 @@ $7777777....$....$777$.....+DI..DDD..DDI...8D...D8......$D:..8D....8D...8D......
 		fmt.Println("Use Ctrl-C to stop")
 		fmt.Print("\n\n")
 
-		app.CreateServer(db, os.Stderr).RunTLS(
+		err = app.CreateServer(db, os.Stderr).RunTLS(
 			config.Server.Address,
 			config.Server.Cert,
 			config.Server.Key)
+		if err != nil {
+			logrus.WithError(err).Fatal("Error running server")
+		}
 
 	}
 }
diff --git a/tools/app/example_config.json b/tools/app/example_config.json
index 22fe857c12..c6f6ca834b 100644
--- a/tools/app/example_config.json
+++ b/tools/app/example_config.json
@@ -7,8 +7,8 @@
   },
   "server": {
     "address": ":8080",
-    "cert": "./tools/kolide.crt",
-    "key": "./tools/kolide.key"
+    "cert": "./tools/osquery/kolide.crt",
+    "key": "./tools/osquery/kolide.key"
   },
   "app": {
     "bcrypt_cost": 12,
@@ -19,4 +19,4 @@
   "osquery": {
     "enroll_secret": "super secure"
   }
-}
\ No newline at end of file
+}