Better handling of ZK exceptions