diff --git a/var/www/blueprints/import_export.py b/var/www/blueprints/import_export.py
index 2297529f..312fe0be 100644
--- a/var/www/blueprints/import_export.py
+++ b/var/www/blueprints/import_export.py
@@ -139,7 +139,7 @@ def objects_misp_export_post():
             objects.append(obj)
 
     if invalid_obj:
-        object_types = ail_objects.get_all_objects_with_subtypes_tuple()
+        object_types = ail_core.get_all_objects_with_subtypes_tuple()
         return render_template("export_object.html", object_types=object_types,
                                to_export=objects, l_obj_invalid=invalid_obj)
 
@@ -151,9 +151,12 @@ def objects_misp_export_post():
     publish = request.form.get('misp_event_info', False)
 
     objs = ail_objects.get_objects(objects)
+    if not objs:
+        return create_json_response({'error': 'Empty Event, nothing to export'}, 400)
+
     try:
         event = misp_exporter_objects.create_event(objs, distribution=distribution, threat_level=threat_level,
-                                               analysis=analysis, info=info, export=export, publish=publish)
+                                                   analysis=analysis, info=info, export=export, publish=publish)
     except MISPConnectionError as e:
         return create_json_response({"error": e.message}, 400)
 
@@ -164,7 +167,7 @@ def objects_misp_export_post():
         return send_file(io.BytesIO(event.encode()), as_attachment=True,
                          download_name=f'ail_export_{event_uuid}.json')
     else:
-        object_types = ail_objects.get_all_objects_with_subtypes_tuple()
+        object_types = ail_core.get_all_objects_with_subtypes_tuple()
         return render_template("export_object.html", object_types=object_types,
                                misp_url=event['url'])