diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj
index 7b84c2a6..52c897f9 100644
--- a/src/babashka/impl/classes.clj
+++ b/src/babashka/impl/classes.clj
@@ -118,6 +118,7 @@
           java.lang.Exception
           java.lang.Float
           java.lang.IllegalArgumentException
+          java.lang.IndexOutOfBoundsException
           java.lang.Integer
           java.lang.Iterable
           java.lang.Long
@@ -297,7 +298,8 @@
                       clojure.lang.Seqable
                       clojure.lang.Volatile
                       java.util.List
-                      java.util.Iterator]
+                      java.util.Iterator
+                      java.util.Map$Entry]
     :custom ~custom-map})
 
 (defmacro gen-class-map []
diff --git a/src/babashka/impl/reify.clj b/src/babashka/impl/reify.clj
index fa008737..6dca3a52 100644
--- a/src/babashka/impl/reify.clj
+++ b/src/babashka/impl/reify.clj
@@ -62,6 +62,10 @@
      clojure.lang.ILookup
      {valAt [[this k] [this k default]]}
 
+     java.util.Map$Entry
+     {getKey [[this]]
+      getValue [[this]]}
+
      clojure.lang.IFn
      {applyTo [[this arglist]]
       invoke  [[this]
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index ad1aa25a..06c7792d 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -436,6 +436,7 @@ Use -- to separate script command line args from bb command line args.
     Comparable java.lang.Comparable
     Double java.lang.Double
     Exception java.lang.Exception
+    IndexOutOfBoundsException java.lang.IndexOutOfBoundsException
     IllegalArgumentException java.lang.IllegalArgumentException
     Integer java.lang.Integer
     Iterable java.lang.Iterable