Fix dealing with error_map with new RemoteError