diff --git a/src/pmcd/pmdaproc.sh b/src/pmcd/pmdaproc.sh
index cf3856a..058c5bb 100644
--- a/src/pmcd/pmdaproc.sh
+++ b/src/pmcd/pmdaproc.sh
@@ -1100,12 +1100,14 @@ _install()
 	#
 	if $do_check
 	then
+	    __ns=""
+	    [ "$NAMESPACE" != "$PMNSDIR/root" ] && __ns="-n $NAMESPACE"
 	    [ "$check_delay" -gt 5 ] && echo "Wait $check_delay seconds for the $iam agent to initialize ..."
 	    sleep $check_delay
 	    for __n in $pmns_name
 	    do
 		$PCP_ECHO_PROG $PCP_ECHO_N "Check $__n metrics have appeared ... ""$PCP_ECHO_C"
-		pminfo -n $NAMESPACE -f $__n | __filter $__n
+		pminfo -f $__ns $__n | __filter $__n
 	    done
 	fi
     else
@@ -1181,10 +1183,12 @@ _remove()
 
 	if $do_check
 	then
+	    __ns=""
+	    [ "$NAMESPACE" != "$PMNSDIR/root" ] && __ns="-n $NAMESPACE"
 	    for __n in $pmns_name
 	    do
 		$PCP_ECHO_PROG $PCP_ECHO_N "Check $__n metrics have gone away ... ""$PCP_ECHO_C"
-		if pminfo -n $NAMESPACE -f $__n >$tmp 2>&1
+		if pminfo -f $__ns $__n >$tmp 2>&1
 		then
 		    echo "Arrgh, something has gone wrong!"
 		    cat $tmp