Remove the exit(1) and add the possibility of throwing an Exception

Remove the exit(1) and add the possibility of throwing an Exception #6