Fixed error messages and handling