FS-5532 - workaround to improve behavior, but not correct fix
fix return values from refactor so stun timeouts can trigger error properly