diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 2a32a9a..3b3d94f 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -153,6 +153,7 @@ function config_get_config_directory($type) {
   if (!empty($config_directories[$type])) {
     return $config_directories[$type];
   }
+  // @todo https://www.drupal.org/node/2696103 Throw a more specific exception.
   throw new \Exception("The configuration directory type '$type' does not exist");
 }
 
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 16fdf8a..b38efb8 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -334,6 +334,8 @@ function file_ensure_htaccess() {
   file_save_htaccess('temporary://', TRUE);
 
   // If a staging directory exists then it should contain a .htaccess file.
+  // @todo https://www.drupal.org/node/2696103 catch a more specific exception
+  //   and simplify this code.
   try {
     $staging = config_get_config_directory(CONFIG_SYNC_DIRECTORY);
   }