Added error_return() macro