Re-adding back in the error catching