Bugfix in failed handler