Changed an 'exit()' to 'return'