diff --git a/src/CharacterManager.cpp b/src/CharacterManager.cpp
index 30fc1ab6ac..8b70d9139f 100644
--- a/src/CharacterManager.cpp
+++ b/src/CharacterManager.cpp
@@ -89,7 +89,7 @@ Character* CharacterManager::GetDefaultCharacter()
 	}
 
 	/* We always have the default character. */
-	ASSERT(0);
+	FAIL_M("There must be a default character available!");
 	return NULL;
 }
 
diff --git a/src/CharacterManager.h b/src/CharacterManager.h
index bd49c20c5e..4a687ee9d3 100644
--- a/src/CharacterManager.h
+++ b/src/CharacterManager.h
@@ -1,19 +1,24 @@
-/* CharacterManager - Manage characters. */
-
 #ifndef CHARACTER_MANAGER_H
 #define CHARACTER_MANAGER_H
 
 class Character;
 struct lua_State;
 
+/** @brief Manage all of the Characters. */
 class CharacterManager
 {
 public:
+	/** @brief Set up the character manager. */
 	CharacterManager();
+	/** @brief Destroy the character manager. */
 	~CharacterManager();
 
 	void GetCharacters( vector<Character*> &vpCharactersOut );
+	/** @brief Get one installed character at random.
+	 * @return The random character. */
 	Character* GetRandomCharacter();
+	/** @brief Get the character assigned as the default.
+	 * @return The default character. */
 	Character* GetDefaultCharacter();
 	Character* GetCharacterFromID( RString sCharacterID );