diff --git a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java b/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
index ada2f44..c842699 100644
--- a/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
+++ b/cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/MongoServiceInfoCreator.java
@@ -5,7 +5,7 @@ import java.util.Map;
 import org.springframework.cloud.service.common.MongoServiceInfo;
 
 /**
- * 
+ *
  * @author Ramnivas Laddad
  *
  */
@@ -19,10 +19,10 @@ public class MongoServiceInfoCreator extends CloudFoundryServiceInfoCreator<Mong
 	public MongoServiceInfo createServiceInfo(Map<String,Object> serviceData) {
 		@SuppressWarnings("unchecked")
 		Map<String,Object> credentials = (Map<String, Object>) serviceData.get("credentials");
-		
+
 		String id = (String) serviceData.get("name");
-		
-		String uri = (String) credentials.get("uri");
+
+		String uri = (String) ((credentials.get("uri") == null) ? credentials.get("url") : credentials.get("uri"));
 
 		return new MongoServiceInfo(id, uri);
 	}