1 files changed, 10 insertions, 4 deletions

diff --git a/java/com/xagasoft/gats/GatsDictionary.java b/java/com/xagasoft/gats/GatsDictionary.java
index 3517b68..b04f02c 100644
--- a/java/com/xagasoft/gats/GatsDictionary.java
+++ b/java/com/xagasoft/gats/GatsDictionary.java
@@ -203,9 +203,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 GatsDictionary getDict( String key )
+        public GatsDictionary getDict( String key ) throws KeyNotFoundException
         {
-                return (GatsDictionary)hValue.get( key );
+                GatsDictionary ret = (GatsDictionary)hValue.get( key );
+                if( ret == null )
+                        throw new KeyNotFoundException( this, key );
+                return ret;
         }
 
         /**
@@ -214,9 +217,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 GatsList getList( String key )
+        public GatsList getList( String key ) throws KeyNotFoundException
         {
-                return (GatsList)hValue.get( key );
+                GatsList ret = (GatsList)hValue.get( key );
+                if( ret == null )
+                        throw new KeyNotFoundException( this, key );
+                return ret;
         }
 
         public void putAll( Map<? extends String, ? extends GatsObject> src )