Follow up to r108927. Replaced die() with throw new MWException(), according to ...