1 files changed, 8 insertions, 0 deletions
diff --git a/packages/json-schemas/src/schema_validator.ts b/packages/json-schemas/src/schema_validator.ts
index 3f303137b..43647b594 100644
--- a/packages/json-schemas/src/schema_validator.ts
+++ b/packages/json-schemas/src/schema_validator.ts
@@ -8,12 +8,18 @@ import { schemas } from './schemas';
  */
 export class SchemaValidator {
     private readonly _validator: Validator;
+    private static _assertSchemaDefined(schema: Schema): void {
+        if (schema === undefined) {
+            throw new Error(`Cannot add undefined schema`);
+        }
+    }
     /**
      * Instantiates a SchemaValidator instance
      */
     constructor() {
         this._validator = new Validator();
         for (const schema of values(schemas)) {
+            SchemaValidator._assertSchemaDefined(schema);
             this._validator.addSchema(schema, schema.id);
         }
     }
@@ -24,6 +30,7 @@ export class SchemaValidator {
      * @param schema The schema to add
      */
     public addSchema(schema: Schema): void {
+        SchemaValidator._assertSchemaDefined(schema);
         this._validator.addSchema(schema, schema.id);
     }
     // In order to validate a complex JS object using jsonschema, we must replace any complex
@@ -37,6 +44,7 @@ export class SchemaValidator {
      * @returns The results of the validation
      */
     public validate(instance: any, schema: Schema): ValidatorResult {
+        SchemaValidator._assertSchemaDefined(schema);
         const jsonSchemaCompatibleObject = JSON.parse(JSON.stringify(instance));
         return this._validator.validate(jsonSchemaCompatibleObject, schema);
     }