diff --git a/ground/classes/Controller.php b/ground/classes/Controller.php
index 2aa59e6..c4d6cd7 100644
--- a/ground/classes/Controller.php
+++ b/ground/classes/Controller.php
@@ -42,7 +42,10 @@ abstract class Controller
             ob_start();
         }
 
-		extract($data);
+		if ( $data && is_array($data) )
+		{
+			extract($data);
+		}
 
 		include App::getBasedir() . 'views/' . $template;
 
@@ -67,7 +70,7 @@ abstract class Controller
 	static function render($template, $data, $return = false)
 	{
 		$content = self::renderPartial($template, $data, true);
-		
+
         $result = self::renderPartial(self::$layout, array(
                 'content' => $content,
                 'styles' => self::$styles,