robustify handling