Fixed error messages and case callbacks