Added intelligent error display