diff --git a/package_tracking/http.py b/package_tracking/http.py
index 83c6a55..7611cc4 100644
--- a/package_tracking/http.py
+++ b/package_tracking/http.py
@@ -158,9 +158,11 @@ def inner():
 
 @bottle.route('/add', method='POST')
 def add_tracking_number():
-    number: str = bottle.request.forms['tracking-number'].strip()
-    name: str = bottle.request.forms['name'].strip()
-    database.add_tracking_number(database.TrackingNumberEntry(number, name))
+    number: str = bottle.request.forms.get('tracking-number')
+    name: str = bottle.request.forms.get('name')
+    if number is None or name is None:
+        bottle.abort(400)
+    database.add_tracking_number(database.TrackingNumberEntry(number.strip(), name.strip()))
     return bottle.redirect('/')