diff --git a/src/main/java/com/mysema/codegen/MemFileManager.java b/src/main/java/com/mysema/codegen/MemFileManager.java
index 72967760a..6ad5adb54 100644
--- a/src/main/java/com/mysema/codegen/MemFileManager.java
+++ b/src/main/java/com/mysema/codegen/MemFileManager.java
@@ -134,13 +134,14 @@ public class MemFileManager extends ForwardingJavaFileManager<JavaFileManager> {
             LocationAndKind key = new LocationAndKind(location,kind);
             if(ramFileSystem.containsKey(key)) {
                 Map<String, JavaFileObject> locatedFiles = ramFileSystem.get(key);
-                for(String name : locatedFiles.keySet()) {
+                for (Map.Entry<String,JavaFileObject> entry : locatedFiles.entrySet()){                    
+                    String name = entry.getKey();
                     String packageName = "";
                     if (name.indexOf('.') > -1){
                         packageName = name.substring(0,name.lastIndexOf('.'));
                     }
                     if(recurse ? packageName.startsWith(pkg) : packageName.equals(pkg)) {
-                        JavaFileObject candidate = locatedFiles.get(name);
+                        JavaFileObject candidate = entry.getValue();
                         if(kinds.contains(candidate.getKind())) {
                             result.add(candidate);
                         }
diff --git a/src/main/java/com/mysema/codegen/MemJavaFileObject.java b/src/main/java/com/mysema/codegen/MemJavaFileObject.java
index aa101b72a..a61f85993 100644
--- a/src/main/java/com/mysema/codegen/MemJavaFileObject.java
+++ b/src/main/java/com/mysema/codegen/MemJavaFileObject.java
@@ -52,7 +52,7 @@ public class MemJavaFileObject extends SimpleJavaFileObject {
 
     @Override
     public InputStream openInputStream() throws IOException, IllegalStateException, UnsupportedOperationException {
-        if(baos != null){
+        if(baos == null){
             throw new FileNotFoundException(name);
         }
         return new ByteArrayInputStream(baos.toByteArray());