Changing exit 2 with exception. Fixing arg split