diff --git a/src/plugins/export/ExportGedcom.py b/src/plugins/export/ExportGedcom.py index 731520781..e54f85530 100644 --- a/src/plugins/export/ExportGedcom.py +++ b/src/plugins/export/ExportGedcom.py @@ -186,15 +186,17 @@ def breakup(txt, limit): # #------------------------------------------------------------------------- def event_has_subordinate_data(event, event_ref): - gotany = event.get_description().strip() or\ - not event.get_date_object().is_empty() or\ - event.get_place_handle() or\ - event.get_attribute_list() or\ - event_ref.get_attribute_list() or\ - event.get_note_list() or\ - event.get_source_references() or\ - event.get_media_list() - return gotany + if event and event_ref: + return (event.get_description().strip() or + not event.get_date_object().is_empty() or + event.get_place_handle() or + event.get_attribute_list() or + event_ref.get_attribute_list() or + event.get_note_list() or + event.get_source_references() or + event.get_media_list()) + else: + return False #-------------------------------------------------------------------------