Back to no error catching