diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 74e31281ca..b0a7ed691a 100644
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -138,8 +138,8 @@ ldap_extended_operation_s(
         return( ld->ld_errno );
 	}
 
-	*retoidp = NULL;
-	*retdatap = NULL;
+	if ( retoidp != NULL ) *retoidp = NULL;
+	if ( retdatap != NULL ) *retdatap = NULL;
 
 	rc = ldap_parse_extended_result( ld, res, retoidp, retdatap, 0 );