From df8f7ee6675338714dd55247995ae12449444366 Mon Sep 17 00:00:00 2001
From: Yasassri Ratnayake <ycrnet@gmail.com>
Date: Fri, 26 Jun 2015 12:55:09 +0530
Subject: [PATCH] Update resolver.js

---
 lib/resolver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/resolver.js b/lib/resolver.js
index f87a6cbd2..6188e0e8b 100644
--- a/lib/resolver.js
+++ b/lib/resolver.js
@@ -526,7 +526,7 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
         obj[key] = output;
       }
     }
-    if(typeof item === 'object') {
+    if(item && typeof item === 'object') {
       this.resolveAllOf(spec, item, depth + 1);
     }
   }