Made event listing sanity check more robus