Huge error handling refactor
Remove object when refresh fails