Exception handeling: added a notification.
little code cleanup