diff --git a/orte/dss/dss_release.c b/orte/dss/dss_release.c
index 1bce53b635..ec944d8672 100644
--- a/orte/dss/dss_release.c
+++ b/orte/dss/dss_release.c
@@ -28,7 +28,7 @@
 
 void orte_dss_release(orte_data_value_t *value)
 {
-    orte_dss_type_info_t *info;
+    orte_dss_type_info_t *info = NULL;
 
     /* check for error */
     if (NULL == value) {
@@ -41,6 +41,7 @@ void orte_dss_release(orte_data_value_t *value)
     if (!(value->type < orte_dss_types->size) ||
         (NULL == (info = orte_pointer_array_get_item(orte_dss_types, value->type)))) {
         ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);
+        return;
     }
 
     info->odti_release_fn(value);
diff --git a/orte/mca/gpr/replica/functional_layer/gpr_replica_trig_ops_fn.c b/orte/mca/gpr/replica/functional_layer/gpr_replica_trig_ops_fn.c
index 670b68a3b5..ca55c9ff1b 100644
--- a/orte/mca/gpr/replica/functional_layer/gpr_replica_trig_ops_fn.c
+++ b/orte/mca/gpr/replica/functional_layer/gpr_replica_trig_ops_fn.c
@@ -992,7 +992,7 @@ int orte_gpr_replica_check_trig(orte_gpr_replica_trigger_t *trig)
     orte_gpr_replica_subscription_t **subs;
     orte_gpr_replica_counter_t **cntr;
     orte_gpr_replica_itagval_t *base_value=NULL;
-    orte_data_type_t base_type;
+    orte_data_type_t base_type = ORTE_UNDEF;
     bool first, fire;
     size_t i, j;
     int rc;