diff --git a/feeds.module b/feeds.module
index 6ba8bfa2278603a1ce79a66e9f12f66193f3bd4a..c2c67222316e2d493e1bed6ac5341a65418a2a20 100644
--- a/feeds.module
+++ b/feeds.module
@@ -380,9 +380,10 @@ function feeds_importer_load($id) {
   try {
     return feeds_importer($id)->existing();
   }
-  catch (FeedsNotExistingException $e) {
-    return FALSE;
-  }
+  catch (FeedsNotExistingException $e) {}
+  catch (InvalidArgumentException $e) {}
+
+  return FALSE;
 }
 
 /**
diff --git a/includes/FeedsConfigurable.inc b/includes/FeedsConfigurable.inc
index 2370cc41d798e2447344fd0e58b0c010982ddbd9..31818bb230dd888ce45f478e034ec1799de75754 100644
--- a/includes/FeedsConfigurable.inc
+++ b/includes/FeedsConfigurable.inc
@@ -44,15 +44,16 @@ abstract class FeedsConfigurable {
   protected $disabled;
 
   /**
-   * Instantiate a FeedsConfigurable object.
+   * Instantiates a FeedsConfigurable object.
    *
-   * Don't use directly, use feeds_importer() or feeds_plugin()
-   * instead.
+   * Don't use directly, use feeds_importer() or feeds_plugin() instead.
+   *
+   * @see feeds_importer()
+   * @see feeds_plugin()
    */
   public static function instance($class, $id) {
-    // This is useful at least as long as we're developing.
-    if (empty($id)) {
-      throw new Exception(t('Empty configuration identifier.'));
+    if (!strlen($id)) {
+      throw new InvalidArgumentException(t('Empty configuration identifier.'));
     }
     static $instances = array();
     if (!isset($instances[$class][$id])) {