diff --git a/gmap_markerinfo.inc b/gmap_markerinfo.inc
index 045903ba5885c4e9065645f3efc76023d4e108ad..3599377b64b957f3429964a2026c2646ae07bf68 100644
--- a/gmap_markerinfo.inc
+++ b/gmap_markerinfo.inc
@@ -177,7 +177,7 @@ function _gmap_compress_icon_def($iconset) {
     for ($c1=0; $c1<count($iconset); $c1++) {
       $temp = isset($iconset[$c1][$order[$c0]]) ? $iconset[$c1][$order[$c0]] : $nulls[$c0];
       // Ensure that numeric quantities are encoded as ints, not strings.
-      if ($ints[$c0]) {
+      if (isset($ints[$c0])) {
         $temp = (int)$temp;
       }
       $a[$c0][$c1] = $temp;
@@ -199,6 +199,9 @@ function _gmap_compress_icon_def($iconset) {
  * Remove trailing duplicates from an array.
  */
 function _gmap_compress_array(&$arr) {
+  if (empty($arr)) {
+    return;
+  }
   $c = count($arr) - 1;
   // Walk backwards and unset duplicates...
   for ($cval = $arr[$c]; $c>0; $c--) {