Fixed error messages from previous commit