diff --git a/src/App.php b/src/App.php
index e5ac5dda3c..9a1536fbe2 100644
--- a/src/App.php
+++ b/src/App.php
@@ -221,7 +221,7 @@ class App
 		$this->config   = $config;
 		$this->profiler = $profiler;
 		$cfgBasePath = $this->config->get('system', 'basepath');
-		$this->basePath = (isset($cfgBasePath) && $cfgBasePath !== '') ? $cfgBasePath : $basePath;
+		$this->basePath = !empty($cfgBasePath) ? $cfgBasePath : $basePath;
 
 		if (!Core\System::isDirectoryUsable($this->basePath, false)) {
 			throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');
diff --git a/src/Core/Config.php b/src/Core/Config.php
index 44556a6017..4bf9c5b11d 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -48,8 +48,6 @@ class Config
 	 * @brief Get a particular user's config variable given the category name
 	 * ($family) and a key.
 	 *
-	 * Note: Please do not store booleans - convert to 0/1 integer values!
-	 *
 	 * @param string  $cat        The category of the configuration value
 	 * @param string  $key           The configuration key to query
 	 * @param mixed   $default_value optional, The value to return if key is not set (default: null)
@@ -67,6 +65,8 @@ class Config
 	 *
 	 * Stores a config value ($value) in the category ($cat) under the key ($key)
 	 *
+	 * Note: Please do not store booleans - convert to 0/1 integer values!
+	 *
 	 * @param string $cat The category of the configuration value
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store