Commented out fall-through in HandlerApplication as it seems to break things.