diff --git a/configuration.drush.inc b/configuration.drush.inc
index de1e275..b8c375d 100644
--- a/configuration.drush.inc
+++ b/configuration.drush.inc
@@ -455,7 +455,7 @@ function _configuration_stop_tracking() {
     return drush_set_error('', dt('No configurations were selected to export'));
   }
 
-  $handlers = configuration_get_handlers();
+  $handlers = ConfigurationManagement::getConfigurationHandler();
   foreach ($args as $arg) {
 
     list($component, $identifier) = explode('.', $arg, 2);
diff --git a/lib/Drupal/configuration/Config/Configuration.php b/lib/Drupal/configuration/Config/Configuration.php
index 3799404..d5c0955 100644
--- a/lib/Drupal/configuration/Config/Configuration.php
+++ b/lib/Drupal/configuration/Config/Configuration.php
@@ -237,12 +237,14 @@ class Configuration {
    * the current configuration.
    */
   public function removeFromStaging(ConfigIteratorSettings &$settings) {
-    db_delete('configuration_staging')
+    $deleted = db_delete('configuration_staging')
       ->condition('component', $this->getComponent())
       ->condition('identifier', $this->getIdentifier())
       ->execute();
 
-    $settings->addInfo('untracked', $this->getUniqueId());
+    if ($deleted > 0) {
+      $settings->addInfo('untracked', $this->getUniqueId());
+    }
   }
 
   /**
