Better notification, think I improved the error handling.

Not sure about the error handling improvement though. It's too late.