diff --git a/CGDWebServer/GCDWebServer.m b/CGDWebServer/GCDWebServer.m
index 320bce5..399a8c0 100644
--- a/CGDWebServer/GCDWebServer.m
+++ b/CGDWebServer/GCDWebServer.m
@@ -102,7 +102,7 @@ NSString* GCDWebServerGetMimeTypeForExtension(NSString* extension) {
       }
     }
   }
-  return mimeType;
+  return mimeType ? mimeType : kGCDWebServerDefaultMimeType;
 }
 
 NSString* GCDWebServerUnescapeURLString(NSString* string) {
diff --git a/CGDWebServer/GCDWebServerResponse.m b/CGDWebServer/GCDWebServerResponse.m
index 1f9ffa9..c3aaf3a 100644
--- a/CGDWebServer/GCDWebServerResponse.m
+++ b/CGDWebServer/GCDWebServerResponse.m
@@ -306,12 +306,8 @@
       return nil;  // TODO: Return 416 status code and "Content-Range: bytes */{file length}" header
     }
   }
-  NSString* type = GCDWebServerGetMimeTypeForExtension([path pathExtension]);
-  if (type == nil) {
-    type = kGCDWebServerDefaultMimeType;
-  }
   
-  if ((self = [super initWithContentType:type contentLength:(range.location != NSNotFound ? range.length : (NSUInteger)info.st_size)])) {
+  if ((self = [super initWithContentType:GCDWebServerGetMimeTypeForExtension([path pathExtension]) contentLength:(range.location != NSNotFound ? range.length : (NSUInteger)info.st_size)])) {
     _path = [path copy];
     if (range.location != NSNotFound) {
       _offset = range.location;