diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/client/CloudQueue.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/client/CloudQueue.java
index 5e4ddf1ffdd7..38592ef9bb51 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/client/CloudQueue.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/queue/client/CloudQueue.java
@@ -830,6 +830,14 @@ public long getApproximateMessageCount() {
      *             If the resource URI is invalid.
      */
     URI getIndividualMessageAddress(final String messageId) throws URISyntaxException {
+        /*
+        if you delete a cloudQueueMessage with a different cloudQueue instance, 
+        PathUtility.appendPathToUri will throw NullPointerException because
+        messageRequestAddress was not initialized by addMessage or retrieveMessage.
+        */
+        if(this.messageRequestAddress == null)
+            this.getMessageRequestAddress();
+
         return PathUtility.appendPathToUri(this.messageRequestAddress, messageId);
     }