diff --git a/pandora/entity/views.py b/pandora/entity/views.py
index 762b1b6f4..ed81b87ec 100644
--- a/pandora/entity/views.py
+++ b/pandora/entity/views.py
@@ -44,6 +44,11 @@ def addEntity(request, data):
     '''
     existing_names = []
     exists = False
+
+    if not utils.get_by_id(settings.CONFIG['entities'], data['type']):
+        response = json_response(status=500, text='unknown entity type')
+        return render_to_json_response(response)
+
     if 'name' in data:
         names = [data['name']] + data.get('alternativeNames', [])
         for name in names: