diff --git a/gradle.properties b/gradle.properties
index 2e6c71f..7e4aa00 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 #ideaVersion = 2016.3.5
 #ideaVersion = 171.3780.95
-ideaVersion = 2017.2.2
+ideaVersion = 2017.2.5
 javaVersion = 1.8
 ijPluginRepoChannel = alpha
 version = 0.13
diff --git a/mule-esb-plugin/src/main/java/org/mule/tooling/esb/framework/MuleFrameworkConfigurable.java b/mule-esb-plugin/src/main/java/org/mule/tooling/esb/framework/MuleFrameworkConfigurable.java
index 7108cf8..68d0a06 100644
--- a/mule-esb-plugin/src/main/java/org/mule/tooling/esb/framework/MuleFrameworkConfigurable.java
+++ b/mule-esb-plugin/src/main/java/org/mule/tooling/esb/framework/MuleFrameworkConfigurable.java
@@ -48,8 +48,10 @@ public void addSupport(@NotNull Module module, @NotNull ModifiableRootModel modi
             LibraryEx libraryEx = (LibraryEx)nextLib;
             if (muleHome == null && MuleLibraryKind.MULE_LIBRARY_KIND.equals(libraryEx.getKind())) {
                 MuleLibraryProperties properties = (MuleLibraryProperties)libraryEx.getProperties();
-                muleHome = properties.getState().getMuleHome();
-                break;
+                if (properties != null && properties.getState() != null) {
+                    muleHome = properties.getState().getMuleHome();
+                    break;
+                }
             }
         }
 
diff --git a/todo.txt b/todo.txt
index 4dcd882..5f30398 100644
--- a/todo.txt
+++ b/todo.txt
@@ -37,4 +37,20 @@ String value = PropertiesComponent.getInstance().getValue( "mypropertystring" );
 
 TODO: Select output, e.g. from printing a Java collection and convert it to DW script.
 
-TODO: API Designer-like RAML Color Highlighter
\ No newline at end of file
+TODO: API Designer-like RAML Color Highlighter
+
+TODO: API Projects support:
+1. API Project
+
+    src/main/resources
+       {environment}
+               apidef/       - RAML, examples, schemas
+               policies/     - policy description file TBD
+               sla_tiers/
+               apidescriptor.json - general API description, endpoint, etc.
+
+2. IDE functionality
+
+   - create new project
+   - add new environment
+   - delete environment