Merge "Don't crash on remote read error, just return"