Improving shell-on-fail