diff --git a/file/lib/data/chat/room/ChatRoom.class.php b/file/lib/data/chat/room/ChatRoom.class.php
index dc1bc5b..f15e5e1 100644
--- a/file/lib/data/chat/room/ChatRoom.class.php
+++ b/file/lib/data/chat/room/ChatRoom.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\chat\room;
+use \wcf\system\cache\CacheHandler;
 
 /**
  * Represents a chat room.
@@ -31,14 +32,17 @@ class ChatRoom extends \wcf\data\DatabaseObject {
 	/**
 	 * Loads the room cache.
 	 */
-	protected static function getCache() {
-		if (self::$cache !== null) return;
-		CacheHandler::getInstance()->addResource(
-			'chatrooms',
-			WCF_DIR.'cache/cache.chatrooms.php',
-			'wcf\system\cache\builder\ChatRoomCacheBuilder'
-		);
-		self::$cache = CacheHandler::getInstance()->get('chatrooms');
+	public static function getCache() {
+		if (self::$cache === null) {
+			CacheHandler::getInstance()->addResource(
+				'chatrooms',
+				WCF_DIR.'cache/cache.chatrooms.php',
+				'wcf\system\cache\builder\ChatRoomCacheBuilder'
+			);
+			self::$cache = CacheHandler::getInstance()->get('chatrooms');
+		}
+		
+		return self::$cache;
 	}
 	
 	/**
diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php
index e0996f2..19abe1f 100644
--- a/file/lib/page/ChatPage.class.php
+++ b/file/lib/page/ChatPage.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\page;
 use \wcf\system\WCF;
+use \wcf\data\chat;
 
 /**
  * Shows the chat-interface
@@ -12,9 +13,11 @@
  * @subpackage	page
  */
 class ChatPage extends AbstractPage {
-	public $roomID = 0;
 	//public $neededModules = array('CHAT_ACTIVE');
 	//public $neededPermissions = array('user.chat.canEnter');
+	public $room = null;
+	public $roomID = 0;
+	public $rooms = array();
 	
 	/**
 	 * @see	\wcf\page\IPage::assignVariables()
@@ -32,6 +35,13 @@ public function assignVariables() {
 	 */
 	public function readData() {
 		parent::readData();
+		$this->rooms = chat\room\ChatRoom::getCache();
+		if (isset($this->rooms[$this->roomID])) {
+			$this->room = $this->rooms[$this->roomID];
+		}
+		else {
+			throw new \wcf\system\exception\IllegalLinkException();
+		}
 	}
 	
 	/**