diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c44d203..9905de9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,9 +25,10 @@ jobs:
 
           # Setup SSH
           mkdir -p ~/.ssh
-          echo "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key
+          chmod 700 ~/.ssh
+          echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
-          ssh-keyscan -p $SSH_PORT -H $SSH_HOST >> ~/.ssh/known_hosts
+          ssh-keyscan -p $SSH_PORT -H $SSH_HOST >> ~/.ssh/known_hosts 2>/dev/null
 
           # Pull latest code and restart service
           echo "🔄 Pulling latest code and restarting service..."
@@ -70,7 +71,7 @@ jobs:
           echo "🔍 Verifying deployment..."
 
           # Setup SSH for verification
-          echo "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key
+          echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
 
           # Test health endpoint
diff --git a/internal/handlers/errors.go b/internal/handlers/errors.go
index 9db06bd..f83f689 100644
--- a/internal/handlers/errors.go
+++ b/internal/handlers/errors.go
@@ -79,7 +79,9 @@ func HandleError(w http.ResponseWriter, r *http.Request, err error) {
 			response.Message = appErr.Message
 		}
 
-		json.NewEncoder(w).Encode(response)
+		if err := json.NewEncoder(w).Encode(response); err != nil {
+			log.Printf("ERROR encoding JSON response: %v", err)
+		}
 		return
 	}
 
@@ -93,7 +95,9 @@ func HandleError(w http.ResponseWriter, r *http.Request, err error) {
 			message = "An error occurred. Please try again later."
 		}
 
-		w.Write([]byte("<div class='error'>" + message + "</div>"))
+		if _, err := w.Write([]byte("<div class='error'>" + message + "</div>")); err != nil {
+			log.Printf("ERROR writing HTMX error response: %v", err)
+		}
 		return
 	}
 
diff --git a/internal/handlers/health.go b/internal/handlers/health.go
index 9b91494..8563954 100644
--- a/internal/handlers/health.go
+++ b/internal/handlers/health.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 	"time"
 )
@@ -35,5 +36,8 @@ func (h *HealthHandler) Check(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(response)
+	if err := json.NewEncoder(w).Encode(response); err != nil {
+		// Log error but don't change response status (already written)
+		log.Printf("ERROR encoding health check response: %v", err)
+	}
 }