correctly return error response when upload rename fails
Merge branch 'master' of https://github.com/educoder/Pikachu