Fixes from Greg Allen to handle errors in notifications.