diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php
index 99c35efa1..dcbd71c32 100644
--- a/e107_core/shortcodes/batch/page_shortcodes.php
+++ b/e107_core/shortcodes/batch/page_shortcodes.php
@@ -244,6 +244,12 @@ class cpage_shortcodes extends e_shortcode
 	
 	function sc_cpagebutton($parm)
 	{
+		
+		if(!check_class($this->var['page_class']))
+		{
+			return "<!-- Button Removed: Page check_class() returned false. -->";	
+		}
+		
 		$url = $this->sc_cpageurl();
 		
 		if($parm == 'href' || !$url)