Feature/694 error notif broke

Fix for #694 and #696.