diff --git a/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java b/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java
index c8891e1d2..048a0369a 100644
--- a/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java
+++ b/router/java/src/org/cybergarage/upnp/event/NotifyRequest.java
@@ -174,6 +174,10 @@ public class NotifyRequest extends SOAPRequest
 	public PropertyList getPropertyList() {
 		PropertyList properties = new PropertyList();
 		Node varSetNode = getEnvelopeNode();
+		// I2P change: ParserException caught in getRootNode() causes
+		// getEnvelopeNode() to return null
+		if (varSetNode == null)
+			return properties;
 		for (int i = 0; i<varSetNode.getNNodes(); i++){
 			Node propNode = varSetNode.getNode(i);
 			if (propNode == null)
@@ -184,4 +188,4 @@ public class NotifyRequest extends SOAPRequest
 		return properties;
 	}
 	
-}	
\ No newline at end of file
+}