Improved handling for error notifications. Updates #15