diff --git a/composer.json b/composer.json
index be50a03..39869f5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "rusticisoftware/tincan",
+    "name": "taylora/tincan",
     "type": "library",
     "description": "Experience API (Tin Can API) Library",
-    "homepage": "http://rusticisoftware.github.io/TinCanPHP/",
+    "homepage": "https://github.com/TayloraLMS/TinCanPHP",
     "keywords": [
         "tin can",
         "tincan",
diff --git a/src/Map.php b/src/Map.php
index 09eff6e..3d9da97 100644
--- a/src/Map.php
+++ b/src/Map.php
@@ -46,7 +46,7 @@ private function _unset($code) {
     }
 
     public function isEmpty() {
-        return count($this->_map) === 0;
+        return count((array)($this->_map)) === 0;
     }
 
     public function __call($func, $args) {