More error robustness