More specific error catching