Added more defensive features to the Condition class