Removed majority of thrown InvalidLocationExceptions.