make checking existing models more robust