Error handling fix, call naughty locally to notifications