Added error passing in the catcher.