r11642: add some error checks