diff --git a/includes/CCTM_OutputFilter.php b/includes/CCTM_OutputFilter.php
index dacdb15..09a74cc 100644
--- a/includes/CCTM_OutputFilter.php
+++ b/includes/CCTM_OutputFilter.php
@@ -87,7 +87,7 @@ public function to_array($input) {
             }
 
 			// See http://code.google.com/p/wordpress-custom-content-type-manager/issues/detail?id=121
-			if ( !is_array($output) ) {
+			if (empty($output) || !is_array($output) ) {
 				$this->is_array_input = false;
 				if (empty($output) && !empty($input)) {					
 					return array($input);
@@ -104,4 +104,4 @@ public function to_array($input) {
 	}
 		
 }
-/*EOF*/
\ No newline at end of file
+/*EOF*/