Improved message errors #32 #29