Duct-taped a possible exception in the (need-to-be-rewritten) Notification System.