diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java
index 90f7c63aa..2dec95769 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java
@@ -50,9 +50,7 @@ protected void run(@NotNull Result result) throws Throwable {
                     return;
                 }
 
-                if(bundleFile != null) {
-                    new OpenFileDescriptor(getProject(), bundleFile.getContainingFile().getVirtualFile(), 0).navigate(true);
-                }
+                new OpenFileDescriptor(getProject(), bundleFile.getContainingFile().getVirtualFile(), 0).navigate(true);
             }
 
             @Override
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java
index ac0bba1fa..3e4e9d69f 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java
@@ -69,7 +69,7 @@ public static PsiElement createBundleFile(@NotNull PhpClass bundleClass, @NotNul
             throw new Exception("File already exists");
         }
 
-        String COMPILER_TEMPLATE = "/resources/fileTemplates/" + template + ".php";
+        String COMPILER_TEMPLATE = "/fileTemplates/" + template + ".php";
         String fileTemplateContent = getFileTemplateContent(COMPILER_TEMPLATE);
         if(fileTemplateContent == null) {
             throw new Exception("Template content error");
@@ -154,7 +154,7 @@ public static PsiElement createCompilerPass(@NotNull PhpClass bundleClass, @NotN
             groupStatement.addRangeBefore(methodReference, semicolon, groupStatement.getLastChild());
         }
 
-        String COMPILER_TEMPLATE = "/resources/fileTemplates/compiler_pass.php";
+        String COMPILER_TEMPLATE = "/fileTemplates/compiler_pass.php";
         String fileTemplateContent = getFileTemplateContent(COMPILER_TEMPLATE);
         if(fileTemplateContent == null) {
             throw new Exception("Template content error");