Fixed error messages and callbacks