Adding full error managment for Message.