diff --git a/.gitignore b/.gitignore
index 4d14471f..e5ba93c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -226,3 +226,24 @@ gurux.dlms.client.example.java/ManufacturerSettings/files.xml
 ManufacturerSettings/files.xml
 gurux.dlms.client.example.java/logFile.txt
 gurux.dlms.client.example.java/trace.txt
+
+#############
+## Maven
+#############
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Exclude maven wrapper
+!/.mvn/wrapper/maven-wrapper.jar
+
+#############
+## Jetbrains: Intellij
+#############
+.idea
diff --git a/development/src/main/java/gurux/dlms/GXDLMSConverter.java b/development/src/main/java/gurux/dlms/GXDLMSConverter.java
index 8b4a21c1..aee08ab8 100644
--- a/development/src/main/java/gurux/dlms/GXDLMSConverter.java
+++ b/development/src/main/java/gurux/dlms/GXDLMSConverter.java
@@ -106,7 +106,13 @@ private static void updateOBISCodeInfo(
             return;
         }
         String ln = it.getLogicalName();
-        GXStandardObisCode code = codes.find(ln, it.getObjectType())[0];
+
+        GXStandardObisCode code = null;
+        GXStandardObisCode[] codesArray = codes.find(ln, it.getObjectType());
+        if (codesArray.length > 0) {
+            code = codes.find(ln, it.getObjectType())[0];
+        }
+
         if (code != null) {
             it.setDescription(code.getDescription());
             // If string is used
diff --git a/gurux.dlms.client.example.java/dependency-reduced-pom.xml b/gurux.dlms.client.example.java/dependency-reduced-pom.xml
deleted file mode 100644
index 62aec5ca..00000000
--- a/gurux.dlms.client.example.java/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.gurux</groupId>
-  <artifactId>gurux.dlms.client.example.java</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <licenses>
-    <license>
-      <name>GNU General Public License, version 2</name>
-      <url>http://www.gnu.org/licenses/gpl-2.0.txt</url>
-    </license>
-  </licenses>
-  <organization>
-    <name>Gurux Ltd.</name>
-    <url>www.gurux.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer>
-                  <mainClass>gurux.dlms.client.sampleclient</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-
diff --git a/gurux.dlms.server.example.java/dependency-reduced-pom.xml b/gurux.dlms.server.example.java/dependency-reduced-pom.xml
deleted file mode 100644
index 5a3aa991..00000000
--- a/gurux.dlms.server.example.java/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.gurux</groupId>
-  <artifactId>gurux.dlms.server.example.java</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <licenses>
-    <license>
-      <name>GNU General Public License, version 2</name>
-      <url>http://www.gnu.org/licenses/gpl-2.0.txt</url>
-    </license>
-  </licenses>
-  <organization>
-    <name>Gurux Ltd.</name>
-    <url>www.gurux.org</url>
-  </organization>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer>
-                  <mainClass>gurux.dlms.server.example.GuruxDlmsServerExample</mainClass>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-