Adjustments for better error recognization