Fix: Do not pass null to function that expects DateTime or string

Fix: Do not pass null to function that expects DateTime or string #32