moved handler exception up the hierachy again to try to catch more client problems