Improved errors workflow