Fixes for errors handlers