diff --git a/.env.example b/.env.example
index 005eff8..5251402 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,8 @@
 # Twilio API credentials
 # (find here https://www.twilio.com/console)
-export TWILIO_ACCOUNT_SID=
-export TWILIO_AUTH_TOKEN=
+TWILIO_ACCOUNT_SID=
+TWILIO_AUTH_TOKEN=
 
 # Verification Service SID
 # (create one here https://www.twilio.com/console/verify/services)
-export VERIFICATION_SID=
+VERIFICATION_SID=
diff --git a/README.md b/README.md
index 1e316ef..25f85c3 100644
--- a/README.md
+++ b/README.md
@@ -62,14 +62,6 @@ After the above requirements have been met:
     ```
     See [Twilio Account Settings](#twilio-account-settings) to locate the necessary environment variables.
 
-    If you are using a UNIX operating system, load the environment variables before the application starts.
-
-    ```bash
-    source .env
-    ```
-
-    _If you are using a different operating system, make sure that all the variables from the `.env` file are loaded into your environment._
-
 3. Build the project
 
     ```bash
diff --git a/pom.xml b/pom.xml
index 852de7d..6a4959a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,11 @@
             <version>2.0.0-beta</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>dotenv-java</artifactId>
+            <version>2.2.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/twilio/verify_quickstart/services/TwilioVerification.java b/src/main/java/com/twilio/verify_quickstart/services/TwilioVerification.java
index fcab0be..98d1fbf 100644
--- a/src/main/java/com/twilio/verify_quickstart/services/TwilioVerification.java
+++ b/src/main/java/com/twilio/verify_quickstart/services/TwilioVerification.java
@@ -4,12 +4,14 @@
 import com.twilio.exception.ApiException;
 import com.twilio.rest.verify.v2.service.Verification;
 import com.twilio.rest.verify.v2.service.VerificationCheck;
+import io.github.cdimascio.dotenv.Dotenv;
 
-public class TwilioVerification implements VerificationService {
 
-    private static final String ACCOUNT_SID = System.getenv("TWILIO_ACCOUNT_SID");
-    private static final String AUTH_TOKEN = System.getenv("TWILIO_AUTH_TOKEN");
-    private static final String VERIFICATION_SID = System.getenv("VERIFICATION_SID");
+public class TwilioVerification implements VerificationService {
+    private static Dotenv env = Dotenv.configure().ignoreIfMissing().load();
+    private static final String ACCOUNT_SID = env.get("TWILIO_ACCOUNT_SID");
+    private static final String AUTH_TOKEN = env.get("TWILIO_AUTH_TOKEN");
+    private static final String VERIFICATION_SID = env.get("VERIFICATION_SID");
 
     public TwilioVerification() {
         Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
diff --git a/src/main/java/com/twilio/verify_quickstart/servlets/ErrorHandler.java b/src/main/java/com/twilio/verify_quickstart/servlets/ErrorHandler.java
new file mode 100644
index 0000000..3c45cf9
--- /dev/null
+++ b/src/main/java/com/twilio/verify_quickstart/servlets/ErrorHandler.java
@@ -0,0 +1,21 @@
+// Import required java libraries
+import java.io.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import java.util.*;
+
+// Extend HttpServlet class
+public class ErrorHandler extends HttpServlet {
+ 
+   // Method to handle GET method request.
+   public void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+        request.getRequestDispatcher("/error.html").forward(request, response);
+   }
+   
+   // Method to handle POST method request.
+   public void doPost(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+      doGet(request, response);
+   }
+}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..f870121
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,23 @@
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+    http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+  <servlet>
+    <servlet-name>ErrorHandler</servlet-name>
+    <servlet-class>ErrorHandler</servlet-class>
+  </servlet>
+
+  <!-- servlet mappings -->
+  <servlet-mapping>
+    <servlet-name>ErrorHandler</servlet-name>
+    <url-pattern>/ErrorHandler</url-pattern>
+  </servlet-mapping>
+
+  <error-page>
+    <error-code>404</error-code>
+    <location>/ErrorHandler</location>
+  </error-page>
+
+  <error-page>
+    <exception-type>java.lang.Throwable</exception-type>
+    <location>/ErrorHandler</location>
+  </error-page>
+</web-app>
diff --git a/src/main/webapp/error.html b/src/main/webapp/error.html
new file mode 100644
index 0000000..8999c95
--- /dev/null
+++ b/src/main/webapp/error.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+
+<html>
+  <body>
+    <h1>Something went wrong! </h1>
+    <h2>Our Engineers are on it</h2>
+    <a href="/">Go Home</a>
+  </body>
+</html>