Fixes some exception handling for the current location