Added null check rewrite for string comparsion