diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 28ba0eef374..ed82829665f 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -89,7 +89,7 @@ func (ss *SqlStore) ensureAdminUser() error {
 	systemUserCountQuery := m.GetSystemUserCountStatsQuery{}
 
 	if err := bus.Dispatch(&systemUserCountQuery); err != nil {
-		fmt.Errorf("Could not determine if admin user exists: %v", err)
+		return fmt.Errorf("Could not determine if admin user exists: %v", err)
 	}
 
 	if systemUserCountQuery.Result.Count > 0 {