Move return into the retry loop
Move return into the retry loop

Johnetordoff/waterbutler,felliott/waterbutler,CenterForOpenScience/waterbutler,RCOSDP/waterbutler,TomBaxter/waterbutler,rdhyee/waterbutler