Solve #5348

Refactor the code to avoid an incorrect (or meaningless) use of inline rescue. 

https://github.com/diaspora/diaspora/issues/5348