[Issue #1477] Moving KVO observer removal code to -didCompleteWithError: