Improved error feedback