Change return to exit(1) when error