diff --git a/Zutil.jar b/Zutil.jar
index b5f2a06..445d14d 100755
Binary files a/Zutil.jar and b/Zutil.jar differ
diff --git a/src/zutil/net/http/HttpServer.java b/src/zutil/net/http/HttpServer.java
old mode 100644
new mode 100755
index 3ecd354..f6c238b
--- a/src/zutil/net/http/HttpServer.java
+++ b/src/zutil/net/http/HttpServer.java
@@ -231,7 +231,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 				out.setHeader( "Content-Type", "text/html" );
 				out.setCookie( "session_id", ""+client_session.get("session_id") );
 
-				if( !parser.getRequestURL().isEmpty() && pages.containsKey(parser.getRequestURL()) ){
+				if( parser.getRequestURL() != null && !parser.getRequestURL().isEmpty() && pages.containsKey(parser.getRequestURL()) ){
 					pages.get(parser.getRequestURL()).respond(out, parser, client_session, cookie, request);
 					logRequest(parser, client_session, cookie, request, time);
 				}
@@ -247,7 +247,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 
 				//********************************************************************************
 			} catch (Exception e) {
-				logger.log(Level.WARNING, "500 Internal Server Error", e);
+				logger.log(Level.SEVERE, "500 Internal Server Error", e);
 				try {
 					if (!out.isHeaderSent())
 						out.setStatusCode(500);
diff --git a/src/zutil/parser/Templator.java b/src/zutil/parser/Templator.java
index 5d18bc3..616927d 100755
--- a/src/zutil/parser/Templator.java
+++ b/src/zutil/parser/Templator.java
@@ -101,6 +101,8 @@ public class Templator {
      * be regenerated if the file changes.
      */
     public Templator(File tmpl) throws IOException {
+        if(tmpl == null)
+            throw new IllegalArgumentException("File can not be null!");
         this.data = new HashMap<String, Object>();
         this.file = tmpl;
         parseTemplate(FileUtil.getContent(file));