diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 9c3f01ad939..f6c9a04a8e7 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -91,7 +91,7 @@ sub ParseFunction($$$)
 		if ($e->{LEVELS}[0]->{TYPE} eq "POINTER") {
 			$level = 1;
 			if ($e->{LEVELS}[0]->{POINTER_TYPE} ne "ref") {
-				$self->pidl("if ( $e->{NAME} ) {");
+				$self->pidl("if ($e->{NAME} && r.out.$e->{NAME}) {");
 				$self->indent;
 			}
 		}