diff --git a/lib/components/Redoc/redoc.js b/lib/components/Redoc/redoc.js
index a7995001..cf50f815 100644
--- a/lib/components/Redoc/redoc.js
+++ b/lib/components/Redoc/redoc.js
@@ -95,7 +95,6 @@ export default class Redoc extends BaseComponent {
         Redoc.appRef = appRef;
         redocEvents.bootstrapped.next();
         console.log('ReDoc bootstrapped!');
-        //resolve();
       },
       error => {
         console.log(error);
diff --git a/lib/utils/SchemaManager.js b/lib/utils/SchemaManager.js
index 6ce129b4..942ee695 100644
--- a/lib/utils/SchemaManager.js
+++ b/lib/utils/SchemaManager.js
@@ -158,8 +158,7 @@ export default class SchemaManager {
 
   findDerivedDefinitions(defPointer) {
     let definition = this.byPointer(defPointer);
-
-    // FIXME maybe not throw?
+    if (!definition) throw new Error(`Can't load schema at ${defPointer}`);
     if (!definition.discriminator) return [];
 
     let globalDefs = this._schema.definitions || {};