Simpler error handling for now