diff --git a/config/logo.ico b/config/logo.ico
index 791a1d0..f5b9d9c 100644
Binary files a/config/logo.ico and b/config/logo.ico differ
diff --git a/pom.xml b/pom.xml
index 607c64d..d07dd86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,102 +1,163 @@
 <?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/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>itext-parent</artifactId>
-		<groupId>com.itextpdf</groupId>
-		<version>1.0.0</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.itextpdf</groupId>
-	<artifactId>itext-rups</artifactId>
-	<name>itext-rups</name>
-	<version>5.5.8</version>
-	<description>Rups, a tool to view PDF structure in a swing gui.</description>
-	<url>http://www.itextpdf.com/</url>
-	<mailingLists>
-		<mailingList>
-			<name>iText Questions</name>
-			<subscribe>
-				http://lists.sourceforge.net/lists/listinfo/itext-questions
-			</subscribe>
-			<post>itext-questions@lists.sourceforge.net</post>
-			<archive>
-				http://news.gmane.org/gmane.comp.java.lib.itext.general
-			</archive>
-			<otherArchives>
-				<otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
-				<otherArchive>http://www.junlu.com/2.html</otherArchive>
-				<otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
-				<otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
-			</otherArchives>
-		</mailingList>
-	</mailingLists>
-	<developers>
-		<developer>
-			<id>blowagie</id>
-			<name>Bruno Lowagie</name>
-			<email>bruno@lowagie.com</email>
-			<url>http://www.lowagie.com</url>
-		</developer>
-		<developer>
-			<id>psoares33</id>
-			<name>Paulo Soares</name>
-			<email>psoares33@users.sourceforge.net</email>
-		</developer>
-		<developer>
-			<id>mstorer</id>
-			<name>Mark Storer</name>
-			<email>mstorer3772@gmail.com</email>
-		</developer>
-		<developer>
-			<id>trumpetinc</id>
-			<name>Kevin Day</name>
-			<email>kevin@trumpetinc.com</email>
-		</developer>
-		<developer>
-			<id>xlv</id>
-			<name>Xavier Le Vourch</name>
-			<email>xavier.levourch@xlv-labs.com</email>
-			<url>http://www.xlv-labs.com</url>
-		</developer>
-	</developers>
-	<licenses>
-		<license>
-			<name>GNU Lesser General Public License v2.1</name>
-			<url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:svn:https://itextrups.svn.sourceforge.net/svnroot/itextrups/trunk/</connection>
-		<url>http://itextrups.svn.sourceforge.net/viewvc/itextrups/</url>
-	</scm>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.8</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-                    <links>
-						<link>http://api.itextpdf.com/itext/</link>
-					</links>
-				    <footer><![CDATA[
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>itext-parent</artifactId>
+    <groupId>com.itextpdf</groupId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>itext-rups</artifactId>
+  <version>5.5.9</version>
+
+  <name>itext-rups</name>
+  <description>RUPS, a tool to view PDF structure in a swing gui.</description>
+  <url>http://itextpdf.com/Products/itext-rups</url>
+
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License v3</name>
+            <url>http://www.fsf.org/licensing/licenses/agpl-3.0.html</url>
+        </license>
+    </licenses>
+
+  <developers>
+    <developer>
+      <id>blowagie</id>
+      <name>Bruno Lowagie</name>
+      <email>bruno@lowagie.com</email>
+      <url>http://www.lowagie.com</url>
+    </developer>
+    <developer>
+      <id>psoares33</id>
+      <name>Paulo Soares</name>
+      <email>psoares33@users.sourceforge.net</email>
+    </developer>
+    <developer>
+      <id>mstorer</id>
+      <name>Mark Storer</name>
+      <email>mstorer3772@gmail.com</email>
+    </developer>
+    <developer>
+      <id>trumpetinc</id>
+      <name>Kevin Day</name>
+      <email>kevin@trumpetinc.com</email>
+    </developer>
+    <developer>
+      <id>xlv</id>
+      <name>Xavier Le Vourch</name>
+      <email>xavier.levourch@xlv-labs.com</email>
+      <url>http://www.xlv-labs.com</url>
+    </developer>
+  </developers>
+
+  <mailingLists>
+    <mailingList>
+      <name>iText on StackOverflow</name>
+      <subscribe>http://stackoverflow.com/questions/tagged/itext</subscribe>
+      <archive>http://stackoverflow.com/questions/tagged/itext</archive>
+      <otherArchives>
+        <otherArchive>http://news.gmane.org/gmane.comp.java.lib.itext.general</otherArchive>
+        <otherArchive>http://itext-general.2136553.n4.nabble.com/</otherArchive>
+        <otherArchive>http://www.junlu.com/2.html</otherArchive>
+        <otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
+        <otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
+      </otherArchives>
+    </mailingList>
+  </mailingLists>
+
+  <scm>
+    <connection>scm:git:git@github.com:itext/rups.git</connection>
+    <url>https://github.com/itext/rups</url>
+  </scm>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://jira.itextsupport.com/</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>jenkins-ci</system>
+    <url>http://ci.itextsupport.com/</url>
+  </ciManagement>
+
+  <properties>
+    <java.version>1.6</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.49</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.49</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+
+    <plugins>
+
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.8</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <links>
+            <link>http://api.itextpdf.com/itext/</link>
+          </links>
+          <footer><![CDATA[
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -108,154 +169,108 @@
 
 </script>
     ]]></footer>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>com.itextpdf.rups.Rups</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-					<archive>
-						<manifest>
-							<mainClass>com.itextpdf.rups.Rups</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id> <!-- this is used for inheritance merges -->
-						<phase>package</phase> <!-- append to the packaging phase. -->
-						<goals>
-							<goal>single</goal> <!-- goals == mojos -->
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-                        <plugin>
-                          <groupId>org.apache.maven.plugins</groupId>
-                          <artifactId>maven-source-plugin</artifactId>
-                          <executions>
-                            <execution>
-                              <id>attach-sources</id>
-                              <goals>
-                                <goal>jar</goal>
-                              </goals>
-                            </execution>
-                          </executions>
-                        </plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>exe</id>
-			<build>
-				<plugins>
-					<plugin>
-						<!-- see http://alakai.org/reference/plugins/launch4j-plugin-usage.html -->
-						<!-- see http://launch4j.sourceforge.net/docs.html for more config options -->
-						<groupId>org.bluestemsoftware.open.maven.plugin</groupId>
-						<artifactId>launch4j-plugin</artifactId>
-						<version>1.5.0.0</version>
-						<executions>
-							<execution>
-								<id>launch4j</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>launch4j</goal>
-								</goals>
-								<configuration>
-									<dontWrapJar>false</dontWrapJar>
-									<headerType>gui</headerType>
-									<outfile>target/Rups.exe</outfile>
-									<jar>target/itext-rups-${project.version}-jar-with-dependencies.jar</jar>
-									<errTitle>Rups</errTitle>
-									<icon>config/logo.ico</icon>
-									<classPath>
-										<mainClass>com.itextpdf.rups.Rups</mainClass>
-										<addDependencies>true</addDependencies>
-										<preCp>anything</preCp>
-									</classPath>
-									<jre>
-										<minVersion>1.5.0</minVersion>
-									</jre>
-									<versionInfo>
-										<fileVersion>5.0.7.0</fileVersion>
-										<txtFileVersion>${project.version}</txtFileVersion>
-										<fileDescription>Rups, object view of pdf content</fileDescription>
-										<copyright>AGPL</copyright>
-										<productVersion>5.0.7.0</productVersion>
-										<txtProductVersion>${project.version}</txtProductVersion>
-										<productName>Rups</productName>
-										<internalName>itext-rups</internalName>
-										<originalFilename>Rups.exe</originalFilename>
-									</versionInfo>
-									<!-- <splash> <file>${basedir}/src/main/installer/images/splash.bmp</file> 
-										<waitForWindow>true</waitForWindow> <timeout>60</timeout> <timeoutErr>false</timeoutErr> 
-										</splash> -->
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
-			<type>jar</type>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.itextpdf</groupId>
-			<artifactId>itextpdf</artifactId>
-			<version>5.5.8</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>1.49</version>
-			<type>jar</type>
-			<scope>compile</scope>
-			<optional>true</optional>
-        </dependency>
-        <dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>1.49</version>
-			<type>jar</type>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>com.itextpdf.rups.Rups</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <archive>
+            <manifest>
+              <mainClass>com.itextpdf.rups.Rups</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase> <!-- append to the packaging phase. -->
+            <goals>
+              <goal>single</goal> <!-- goals == mojos -->
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <!-- see http://alakai.org/reference/plugins/launch4j-plugin-usage.html -->
+        <!-- see http://launch4j.sourceforge.net/docs.html for more config 
+          options -->
+        <groupId>org.bluestemsoftware.open.maven.plugin</groupId>
+        <artifactId>launch4j-plugin</artifactId>
+        <version>1.5.0.0</version>
+        <executions>
+          <execution>
+            <id>launch4j</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>launch4j</goal>
+            </goals>
+            <configuration>
+              <dontWrapJar>false</dontWrapJar>
+              <headerType>gui</headerType>
+              <outfile>target/Rups.exe</outfile>
+              <jar>target/itext-rups-${project.version}-jar-with-dependencies.jar</jar>
+              <errTitle>Rups</errTitle>
+              <icon>config/logo.ico</icon>
+              <classPath>
+                <mainClass>com.itextpdf.rups.Rups</mainClass>
+                <addDependencies>true</addDependencies>
+                <preCp>anything</preCp>
+              </classPath>
+              <jre>
+                <minVersion>1.6.0</minVersion>
+              </jre>
+              <versionInfo>
+                <fileVersion>5.5.9.0</fileVersion>
+                <txtFileVersion>${project.version}</txtFileVersion>
+                <fileDescription>Rups, object view of pdf content</fileDescription>
+                <copyright>AGPL</copyright>
+                <productVersion>5.5.9.0</productVersion>
+                <txtProductVersion>${project.version}</txtProductVersion>
+                <productName>RUPS</productName>
+                <internalName>itext-rups</internalName>
+                <originalFilename>Rups.exe</originalFilename>
+              </versionInfo>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+
+  </build>
 
 </project>
diff --git a/src/main/java/com/itextpdf/rups/view/itext/treenodes/StructureTreeNode.java b/src/main/java/com/itextpdf/rups/view/itext/treenodes/StructureTreeNode.java
index 65e7d0c..43b5859 100644
--- a/src/main/java/com/itextpdf/rups/view/itext/treenodes/StructureTreeNode.java
+++ b/src/main/java/com/itextpdf/rups/view/itext/treenodes/StructureTreeNode.java
@@ -65,7 +65,7 @@ public StructureTreeNode() {
 	public StructureTreeNode(PdfObjectTreeNode node, String icon) {
 		super(icon);
 		this.object_node = node;
-		if (node.isDictionary()) {
+		if (node != null && node.isDictionary()) {
 			PdfDictionary dict = (PdfDictionary)node.getPdfObject();
 			if (dict.get(PdfName.TYPE) == null || dict.checkType(PdfName.STRUCTELEM)) {
 				StringBuffer buf = new StringBuffer();