diff --git a/.gitignore b/.gitignore
index 48b4d39b..c59824e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
+/config
 config.h
 config.h.in
 config.log
@@ -16,8 +17,11 @@ configure
 debian
 stamp-h1
 
-# python build directory
+# python
 dist
+*.egg-info
+.cache
+*.pyc
 
 # intellij
 *.iml
@@ -30,16 +34,12 @@ dist
 coverage.xml
 
 # python files
-*.egg-info
 
 # ignore package files
 *.rpm
 *.deb
 *.tar.gz
 
-# pytest cache files
-.cache
-
 # ignore swap files
 *.swp
 
diff --git a/webapp/app.py b/webapp/app.py
index 4baad787..e0514e11 100644
--- a/webapp/app.py
+++ b/webapp/app.py
@@ -1,9 +1,9 @@
 import os
 
-from bottle import HTTPError
 from flask import Flask
 from flask import jsonify
 from flask import request
+from werkzeug.exceptions import HTTPException
 
 import core_utils
 import emane_routes
@@ -78,9 +78,9 @@ def upload():
     return jsonify()
 
 
-@app.errorhandler(HTTPError)
+@app.errorhandler(HTTPException)
 def handle_error(e):
-    return jsonify(message=e.body, status=e.status_code), e.status_code
+    return jsonify(message=e.description, status=e.code), e.code
 
 
 if __name__ == "__main__":
diff --git a/webapp/core_utils.py b/webapp/core_utils.py
index 60f9da04..4fc8685f 100644
--- a/webapp/core_utils.py
+++ b/webapp/core_utils.py
@@ -2,7 +2,7 @@ import os
 from functools import wraps
 from threading import Lock
 
-from bottle import abort
+from werkzeug.exceptions import abort
 
 save_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "uploads")
 CORE_LOCK = Lock()