diff --git a/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/model/Q7ResourceInfo.java b/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/model/Q7ResourceInfo.java
index 07a37b0..d7e65ff 100644
--- a/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/model/Q7ResourceInfo.java
+++ b/core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/model/Q7ResourceInfo.java
@@ -47,9 +47,9 @@
 		if (file != null) {
 			timestamp = file.getModificationStamp();
 		}
+		URI uri = URI.createPlatformResourceURI(file != null ? file
+				.getFullPath().toString() : "__uri__", true);
 		if (resource == null) {
-			URI uri = URI.createPlatformResourceURI(file != null ? file
-					.getFullPath().toString() : "__uri__", true);
 			createResource(uri);
 		}
 		model = getPersistenceModel();
@@ -77,7 +77,7 @@
 			EList<EObject> contents = resource.getContents();
 			resource.setModified(false);
 			if (contents.size() == 0 ) {
-				throw new RuntimeException("Empty resource " + file.getLocation());
+				throw new RuntimeException("Empty resource " + uri);
 			}
 			for (EObject eObject : contents) {
 				if (eObject instanceof NamedElement) {