Condition handling improvements