Remove extra slashes in FSVS_REPOSITORY URI
Fix another issue where the error handling routine could run twice