Adds slightly better message getting