Simpler error catching