diff --git a/src/D2ItemData.php b/src/D2ItemData.php
index f784084..0070544 100755
--- a/src/D2ItemData.php
+++ b/src/D2ItemData.php
@@ -28,8 +28,15 @@ class D2ItemData {
 				$x[] = $i;
 			}
 
-
-			$invClean = array_filter($x[0]);
+			if(!empty($x[0])){
+				$x[0] = array_filter($x[0]);
+			}
+			$invClean = $x[0];
+			if (!empty($invClean)){
+				$return = array_merge($res, $invClean);
+			} else {
+				$return = $res;
+			}
 
 			$return = array_merge($res, $invClean);
 		} else {
@@ -140,7 +147,11 @@ class D2ItemData {
 			$baseItemInfo = PDO_FetchRow($sqlWeapons);
 		}
 
-		$return['baseItemInfo'] = array_filter($baseItemInfo);
+		$return['baseItemInfo'] = $baseItemInfo;
+		
+		if(!empty($baseItemInfo)){
+			$return['baseItemInfo'] = array_filter($baseItemInfo);
+		}
 
 		if(!$doc){
 			header('Content-Type: application/json');