diff --git a/handler_user.go b/handler_user.go
index b3bc51e..686a066 100644
--- a/handler_user.go
+++ b/handler_user.go
@@ -44,7 +44,7 @@ func (cfg *apiConfig) handlerUsersCreate(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	user, err := cfg.DB.GetUserByAPIKey(r.Context(), apiKey)
+	user, err := cfg.DB.GetUser(r.Context(), apiKey)
 	if err != nil {
 		log.Println(err)
 		respondWithError(w, http.StatusInternalServerError, "Couldn't get user")
diff --git a/internal/database/users.sql.go b/internal/database/users.sql.go
index 14d632e..85936f6 100644
--- a/internal/database/users.sql.go
+++ b/internal/database/users.sql.go
@@ -40,13 +40,13 @@ func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) error {
 	return err
 }
 
-const getUserByAPIKey = `-- name: GetUserByAPIKey :one
+const getUser = `-- name: GetUser :one
 
 SELECT id, created_at, updated_at, name, api_key FROM users WHERE api_key = ?
 `
 
-func (q *Queries) GetUserByAPIKey(ctx context.Context, apiKey string) (User, error) {
-	row := q.db.QueryRowContext(ctx, getUserByAPIKey, apiKey)
+func (q *Queries) GetUser(ctx context.Context, apiKey string) (User, error) {
+	row := q.db.QueryRowContext(ctx, getUser, apiKey)
 	var i User
 	err := row.Scan(
 		&i.ID,
diff --git a/main.go b/main.go
index 474b8cc..47a6774 100644
--- a/main.go
+++ b/main.go
@@ -27,7 +27,10 @@ type apiConfig struct {
 var staticFiles embed.FS
 
 func main() {
-	godotenv.Load(".env")
+	err := godotenv.Load(".env")
+	if err != nil {
+		log.Fatalf("Error loading .env file: %v", err)
+	}
 
 	port := os.Getenv("PORT")
 	if port == "" {
diff --git a/middleware_auth.go b/middleware_auth.go
index 0c9a688..f6a358e 100644
--- a/middleware_auth.go
+++ b/middleware_auth.go
@@ -17,7 +17,7 @@ func (cfg *apiConfig) middlewareAuth(handler authedHandler) http.HandlerFunc {
 			return
 		}
 
-		user, err := cfg.DB.GetUserByAPIKey(r.Context(), apiKey)
+		user, err := cfg.DB.GetUser(r.Context(), apiKey)
 		if err != nil {
 			respondWithError(w, http.StatusNotFound, "Couldn't get user")
 			return
diff --git a/sql/queries/users.sql b/sql/queries/users.sql
index bd9a86f..3e979b6 100644
--- a/sql/queries/users.sql
+++ b/sql/queries/users.sql
@@ -9,6 +9,6 @@ VALUES (
 );
 --
 
--- name: GetUserByAPIKey :one
+-- name: GetUser :one
 SELECT * FROM users WHERE api_key = ?;
 --