diff --git a/WebContent/META-INF/context.example.xml b/WebContent/META-INF/context.example.xml
deleted file mode 100755
index 021a9cf..0000000
--- a/WebContent/META-INF/context.example.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This file should modified and copied to /etc/tomcat7/Catalina/localhost/Zallery.xml -->
-<Context>
-
-    <!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
-	<Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
-	<Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/Zallery/" />
-	<Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
-	<Environment type="java.lang.String" name="DATA_PATH" value="C:\\data" />
-
-	<Resource
-		name="jdbc/mysql"
-		auth="Container"
-		type="javax.sql.DataSource"
-		username="username"
-		password="password"
-		driverClassName="com.mysql.jdbc.Driver"
-		url="jdbc:mysql://host:3306/database"
-		maxActive="8"
-		maxIdle="4"
-		validationQuery="SELECT 1"
-		testOnBorrow="true" />
-
-</Context>
\ No newline at end of file
diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
new file mode 100755
index 0000000..738b6dc
--- /dev/null
+++ b/WebContent/META-INF/context.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file should modified and copied to /etc/tomcat7/Catalina/localhost/Zallery.xml -->
+<Context reloadable="true">
+
+    <Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
+    <Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/Zallery/" />
+    <Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
+    <Environment type="java.lang.String" name="DATA_PATH" value="C:\\data" />
+
+    <Resource
+        name="jdbc/mysql"
+        auth="Container"
+        type="javax.sql.DataSource"
+        username="username"
+        password="password"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://host:3306/database"
+        maxActive="8"
+        maxIdle="4"
+        validationQuery="SELECT 1"
+        testOnBorrow="true" />
+
+</Context>
\ No newline at end of file
diff --git a/src/zall/Zallery.java b/src/zall/Zallery.java
index d9416ee..9c366ef 100755
--- a/src/zall/Zallery.java
+++ b/src/zall/Zallery.java
@@ -51,6 +51,10 @@ public class Zallery extends HttpServlet{
 		ROOT_PATH = config.getServletContext().getRealPath("/");
         try {
             Context context = new InitialContext();
+            // Check if Zallery has been properly configured
+			if ("C:\\\\data".equals(context.lookup("java:comp/env/DATA_PATH")))
+				throw new ServletException("Zallery has not been properly configured, set proper configuration in Zaller.xml context file.");
+
             WEBSITE_NAME = (String)context.lookup("java:comp/env/WEBSITE_NAME");
             WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL");
             if( WEBSITE_URL.charAt(WEBSITE_URL.length()-1) != '/')