Revert "(#1339) - prevent hangs on erros"

This reverts commit e3be5f9114097454da07db28104b675b6b6e0cf7.