Changed some error messages
Finish Release-2.1.4