2 files changed, 43 insertions, 8 deletions

diff --git a/java/com/xagasoft/gats/GatsDictionary.java b/java/com/xagasoft/gats/GatsDictionary.java
index 654dc6c..3517b68 100644
--- a/java/com/xagasoft/gats/GatsDictionary.java
+++ b/java/com/xagasoft/gats/GatsDictionary.java
@@ -147,9 +147,12 @@ public class GatsDictionary extends GatsObject implements Map<String,GatsObject>
          * key specified does not appear in the GatsDictionary or is not the correct
          * type you will get the expected exception.
          */
-        public long getInt( String key )
+        public long getInt( String key ) throws KeyNotFoundException
         {
-                return ((GatsInteger)hValue.get( key )).getValue();
+                GatsInteger ret = (GatsInteger)hValue.get( key );
+                if( ret == null )
+                        throw new KeyNotFoundException( this, key );
+                return ret.getValue();
         }
 
         /**
@@ -158,9 +161,12 @@ public class GatsDictionary extends GatsObject implements Map<String,GatsObject>
          * key specified does not appear in the GatsDictionary or is not the correct
          * type you will get the expected exception.
          */
-        public double getFloat( String key )
+        public double getFloat( String key ) throws KeyNotFoundException
         {
-                return ((GatsFloat)hValue.get( key )).getValue();
+                GatsFloat ret = (GatsFloat)hValue.get( key );
+                if( ret == null )
+                        throw new KeyNotFoundException( this, key );
+                return ret.getValue();
         }
 
         /**
@@ -169,9 +175,12 @@ public class GatsDictionary extends GatsObject implements Map<String,GatsObject>
          * key specified does not appear in the GatsDictionary or is not the correct
          * type you will get the expected exception.
          */
-        public boolean getBool( String key )
+        public boolean getBool( String key ) throws KeyNotFoundException
         {
-                return ((GatsBoolean)hValue.get( key )).getValue();
+                GatsBoolean ret = (GatsBoolean)hValue.get( key );
+                if( ret == null )
+                        throw new KeyNotFoundException( this, key );
+                return ret.getValue();
         }
 
         /**
@@ -180,9 +189,12 @@ public class GatsDictionary extends GatsObject implements Map<String,GatsObject>
          * key specified does not appear in the GatsDictionary or is not the correct
          * type you will get the expected exception.
          */
-        public byte[] getString( String key )
+        public byte[] getString( String key ) throws KeyNotFoundException
         {
-                return ((GatsString)hValue.get( key )).getValue();
+                GatsString ret = (GatsString)hValue.get( key );
+                if( ret == null )
+                        throw new KeyNotFoundException( this, key );
+                return ret.getValue();
         }
 
         /**
diff --git a/java/com/xagasoft/gats/KeyNotFoundException.java b/java/com/xagasoft/gats/KeyNotFoundException.java
new file mode 100644
index 0000000..d46fc47
--- /dev/null
+++ b/java/com/xagasoft/gats/KeyNotFoundException.java
@@ -0,0 +1,23 @@
+package com.xagasoft.gats;
+
+public class KeyNotFoundException extends Exception
+{
+        private Object oSrc = null;
+        private String sKey = null;
+
+        public KeyNotFoundException( Object oSrc, String sKey )
+        {
+                this.oSrc = oSrc;
+                this.sKey = sKey;
+        }
+
+        public Object getSource()
+        {
+                return oSrc;
+        }
+
+        public String getKey()
+        {
+                return sKey;
+        }
+}