Improving error handling for conditions.