Added some checks to create message, since auto conversion was failing.