(#1339) - prevent hangs on erros