diff --git a/src/main/java/com/eactive/eai/adapter/AdapterManager.java b/src/main/java/com/eactive/eai/adapter/AdapterManager.java
index 84bec69..e4f31c1 100644
--- a/src/main/java/com/eactive/eai/adapter/AdapterManager.java
+++ b/src/main/java/com/eactive/eai/adapter/AdapterManager.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -163,6 +164,9 @@ public class AdapterManager implements Lifecycle {
 	}
 
 	public AdapterVO getAdapterVO(String adapterGroupName, String adapterName) {
+		if(StringUtils.isAnyBlank(adapterGroupName, adapterName))
+			return null;
+			
 		AdapterGroupVO gvo = adapterGroups.get(adapterGroupName);
 		if (gvo == null)
 			return null;