[FEATURE] Improved error messages