diff --git a/internal/commands/survey/start.go b/internal/commands/survey/start.go
index 4cd2fd9..1eb2c40 100644
--- a/internal/commands/survey/start.go
+++ b/internal/commands/survey/start.go
@@ -23,6 +23,6 @@ func init() {
 	StartCmd.Flags().StringVarP(&InterfaceType, "interface", "i", "", "Specify interface.")
 	StartCmd.RegisterFlagCompletionFunc("task", shellcomp.CompletionFunc(task.ListTasks()))
 	StartCmd.RegisterFlagCompletionFunc("interface", shellcomp.CompletionFunc(task.ListInterfaces()))
-	StartCmd.Flags().BoolVar(&DevFlag, "dev", false, "Enable development mode, which skips database connection, submission, task intro and questionare")
+	StartCmd.Flags().BoolVar(&DevFlag, "dev", false, "Enable development mode, which skips database connection, submission, task intro and questionnaire")
 
 }
diff --git a/internal/models/config.go b/internal/models/config.go
index 9dbd45e..7f49800 100644
--- a/internal/models/config.go
+++ b/internal/models/config.go
@@ -24,7 +24,9 @@ var BaseConfig = Config{
 }
 
 func (c Config) LoadFromEnv() Config {
-	c.DbUri = os.Getenv("DB_URI")
+	if dbURI, ok := os.LookupEnv("DB_URI"); ok {
+		c.DbUri = dbURI
+	}
 	return c
 }