Fixed bugs in exception handling that exited -f too soon
Minor fix