diff --git a/opal/dss/dss_unpack.c b/opal/dss/dss_unpack.c
index 2ab586eed9..7bd0a0bae4 100644
--- a/opal/dss/dss_unpack.c
+++ b/opal/dss/dss_unpack.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -9,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved. 
+ * Copyright (c) 2012-2015 Los Alamos National Security, Inc.  All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2015 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -430,6 +431,7 @@ int opal_dss_unpack_float(opal_buffer_t *buffer, void *dest,
         tmp = strtof(convert, NULL);
         memcpy(&desttmp[i], &tmp, sizeof(tmp));
         free(convert);
+        convert = NULL;
     }
     return OPAL_SUCCESS;
 }
@@ -460,6 +462,7 @@ int opal_dss_unpack_double(opal_buffer_t *buffer, void *dest,
         tmp = strtod(convert, NULL);
         memcpy(&desttmp[i], &tmp, sizeof(tmp));
         free(convert);
+        convert = NULL;
     }
     return OPAL_SUCCESS;
 }