Added error handlers back in