Fixed return on error