Fixed error messages to more informative