diff --git a/plugins/xmm/mm-modem-helpers-xmm.c b/plugins/xmm/mm-modem-helpers-xmm.c
index 6b2e98d3..083c1adf 100644
--- a/plugins/xmm/mm-modem-helpers-xmm.c
+++ b/plugins/xmm/mm-modem-helpers-xmm.c
@@ -799,11 +799,11 @@ mm_xmm_xcesq_response_to_signal_info      (const gchar  *response,
         return FALSE;
     }
 
-    if (gsm)
+    if (out_gsm)
         *out_gsm = gsm;
-    if (umts)
+    if (out_umts)
         *out_umts = umts;
-    if (lte)
+    if (out_lte)
         *out_lte = lte;
 
     return TRUE;
diff --git a/plugins/xmm/mm-shared-xmm.c b/plugins/xmm/mm-shared-xmm.c
index 6181a444..3aa85c2d 100644
--- a/plugins/xmm/mm-shared-xmm.c
+++ b/plugins/xmm/mm-shared-xmm.c
@@ -734,6 +734,11 @@ mm_shared_xmm_signal_load_values_finish    (MMIfaceModemSignal  *self,
     if (!response || !mm_xmm_xcesq_response_to_signal_info (response, gsm, umts, lte, error))
         return FALSE;
 
+    if (cdma)
+        *cdma = NULL;
+    if (evdo)
+        *evdo = NULL;
+
     return TRUE;
 }