Index: branches/5.2.x/core/units/system_event_subscriptions/system_event_subscription_tp.php =================================================================== diff -u -N -r15274 -r15290 --- branches/5.2.x/core/units/system_event_subscriptions/system_event_subscription_tp.php (.../system_event_subscription_tp.php) (revision 15274) +++ branches/5.2.x/core/units/system_event_subscriptions/system_event_subscription_tp.php (.../system_event_subscription_tp.php) (revision 15290) @@ -1,6 +1,6 @@ _subscriptions->GetDBField('BindToSystemEvent')); + if ( !$event->Prefix ) { + throw new Exception('Subscription "#' . $this->_subscriptions->GetID() . '" is connected to invalid or missing e-mail event "#' . $this->_subscriptions->GetDBField('EmailEventId') . '"'); + } + return $event->Prefix; }