Remove flow-control by Exception, cover two missing lines with test.