diff --git a/lib/syslib/ds.c b/lib/syslib/ds.c
index 833fd943e..d647c41d5 100644
--- a/lib/syslib/ds.c
+++ b/lib/syslib/ds.c
@@ -131,8 +131,10 @@ u32_t *value;
 
 	cpf_revoke(g_key);
 
-	/* Assign u32 value. */
-	*value = m.DS_VAL;
+	if(r == OK) {
+		/* Assign u32 value. */
+		*value = m.DS_VAL;
+	}
 
 	return r;
 }