Fix #402 - Do null checking and fix style of string content