Add some error handling & show/hide notification