Fixed exception being thrown for null json value