diff --git a/plugins/org.springframework.ide.eclipse.data.core/src/main/java/org/springframework/ide/eclipse/data/jdt/core/RepositoryInformation.java b/plugins/org.springframework.ide.eclipse.data.core/src/main/java/org/springframework/ide/eclipse/data/jdt/core/RepositoryInformation.java
index a871e98870..04d6acc1bd 100644
--- a/plugins/org.springframework.ide.eclipse.data.core/src/main/java/org/springframework/ide/eclipse/data/jdt/core/RepositoryInformation.java
+++ b/plugins/org.springframework.ide.eclipse.data.core/src/main/java/org/springframework/ide/eclipse/data/jdt/core/RepositoryInformation.java
@@ -79,7 +79,6 @@ public static Module getModuleOf(IBean bean) {
 	private final Class<?> repositoryBaseInterface;
 
 	public RepositoryInformation(IType type) {
-
 		try {
 			this.type = type;
 
@@ -118,9 +117,11 @@ public static RepositoryInformation create(IType type) {
 		Assert.notNull(type);
 
 		try {
-			return type.isInterface() ? new RepositoryInformation(type) : null;
+			return type.isInterface()  && type.exists() ? new RepositoryInformation(type) : null;
 		} catch (JavaModelException e) {
 			return null;
+		} catch (IllegalArgumentException e) {
+			return null;
 		}
 	}