diff --git a/Dockerfile b/Dockerfile
index c9fbc9f..f464bb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ FROM openjdk:11-jre
 # Set dir inside the container
 WORKDIR /app
 
-# Copy built ja file from previous "build" step to app dir
+# Copy built jar file from previous "build" step to app dir
 COPY --from=build /app/target/server-*.jar /app/
 
 # Make port accessible from outside of the container
diff --git a/src/main/java/ch/ibw/appl/todo/server/shared/infra/HttpServer.java b/src/main/java/ch/ibw/appl/todo/server/shared/infra/HttpServer.java
index 648e704..04cac98 100644
--- a/src/main/java/ch/ibw/appl/todo/server/shared/infra/HttpServer.java
+++ b/src/main/java/ch/ibw/appl/todo/server/shared/infra/HttpServer.java
@@ -32,7 +32,8 @@ public void start() {
       final boolean isCorsPreflight = request.requestMethod().equalsIgnoreCase("options");
       final boolean isHello = request.pathInfo().equalsIgnoreCase("/hello");
       if(!isHello && !isCorsPreflight){
-        final boolean clientWantsJson = request.headers("Accept").contains("application/json");
+        String accept = request.headers("Accept");
+        boolean clientWantsJson = accept != null && accept.contains("application/json");
         if(!clientWantsJson){
           server.halt(HttpStatus.NOT_ACCEPTABLE_406);
         }