diff --git a/src/Utils.cpp b/src/Utils.cpp
index 85f24d81..2ff55492 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -463,10 +463,13 @@ timeval CUtils::ParseServerTime(const CString& sTime) {
 	memset(&stm, 0, sizeof(stm));
 	const char* cp = strptime(sTime.c_str(), "%Y-%m-%dT%H:%M:%S", &stm);
 	struct timeval tv;
-	tv.tv_sec = mktime(&stm);
-	CString s_usec(cp);
-	if (s_usec.TrimPrefix(".") && s_usec.TrimSuffix("Z")) {
-		tv.tv_usec = s_usec.ToULong() * 1000;
+	memset(&tv, 0, sizeof(stm));
+	if (cp) {
+		tv.tv_sec = mktime(&stm);
+		CString s_usec(cp);
+		if (s_usec.TrimPrefix(".") && s_usec.TrimSuffix("Z")) {
+			tv.tv_usec = s_usec.ToULong() * 1000;
+		}
 	}
 	return tv;
 }
diff --git a/test/UtilsTest.cpp b/test/UtilsTest.cpp
index f3926ffb..13d72cf5 100644
--- a/test/UtilsTest.cpp
+++ b/test/UtilsTest.cpp
@@ -96,6 +96,10 @@ TEST(UtilsTest, ServerTime) {
 	EXPECT_EQ(now.tv_sec, tv2.tv_sec);
 	EXPECT_EQ(now.tv_usec, tv2.tv_usec);
 
+	timeval tv3 = CUtils::ParseServerTime("invalid");
+	CString str3 = CUtils::FormatServerTime(tv3);
+	EXPECT_EQ("1970-01-01T00:00:00.000Z", str3);
+
 	if (oldTZ) {
 		setenv("TZ", oldTZ, 1);
 		free(oldTZ);