diff --git a/main.py b/main.py
index 4dd3fec..7a0ffa0 100644
--- a/main.py
+++ b/main.py
@@ -2,12 +2,30 @@
 from flask import Flask, jsonify, request, abort
 from flask_swagger import swagger
 from sqlalchemy import func
+from werkzeug.exceptions import HTTPException
+
 
 app = Flask(__name__)
 app.config.from_object('config.Config')
 
 from models import db, HadithCollection, Book, Hadith
 
+@app.before_request
+def verify_secret():
+    if request.headers.get('x-aws-secret') != app.config['AWS_SECRET']:
+        abort(401)
+
+@app.errorhandler(HTTPException)
+def jsonify_http_error(error):
+    response = {
+        'error': {
+            'details': error.description,
+            'code': error.code
+        }
+    }
+
+    return jsonify(response), error.code
+
 def paginate_results(f):
     @functools.wraps(f)
     def decorated_function(*args, **kwargs):
@@ -29,11 +47,6 @@ def decorated_function(*args, **kwargs):
 def home():
     return "<h1>Welcome to sunnah.com API.</p>"
 
-@app.before_request
-def verify_secret():
-    if request.headers.get('x-aws-secret') != app.config['AWS_SECRET']:
-        abort(401)
-
 @app.route("/v1/spec")
 def spec():
     swag = swagger(app)