--- a/tools/JavaSettingsApplication.st	Wed Apr 13 20:41:15 2016 +0100
+++ b/tools/JavaSettingsApplication.st	Wed Apr 13 20:42:43 2016 +0100
@@ -1,5 +1,7 @@
 "{ Package: 'stx:libjava/tools' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractSettingsApplication subclass:#JavaSettingsApplication
 	instanceVariableNames:'javaHomeHolder infoPanel javaHomeInfoHolder'
 	classVariableNames:''
@@ -569,11 +571,14 @@
     <resource: #uiAspect>
 
     ^ [
-        | homesAndReleases |    
+        | homesAndReleases systemRelease |    
 
         homesAndReleases := OrderedCollection withAll: JavaRelease available .
-        (homesAndReleases includesIdentical: JavaRelease system) ifFalse:[ 
-            homesAndReleases add: JavaRelease system.
+        systemRelease := JavaRelease system.
+        systemRelease notNil ifTrue:[
+            (homesAndReleases includesIdentical: systemRelease) ifFalse:[ 
+                homesAndReleases add: JavaRelease system.
+            ].
         ].
         (homesAndReleases anySatisfy: [:release | release javaHome = self javaHomeHolder value ]) ifFalse:[ 
             homesAndReleases addFirst: self javaHomeHolder value.
@@ -583,7 +588,7 @@
     ]
 
     "Created: / 09-12-2014 / 11:22:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 09-12-2014 / 14:06:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-04-2016 / 20:12:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 trueHolder