* QueryStringCreator added null value check