diff --git a/browser/swagger-client.js b/browser/swagger-client.js
index b9753d426..1c53abfe2 100644
--- a/browser/swagger-client.js
+++ b/browser/swagger-client.js
@@ -1475,6 +1475,9 @@ Resolver.prototype.resolveAllOf = function(spec, obj, depth) {
   var name;
   for(var key in obj) {
     var item = obj[key];
+    if(item === null) {
+      throw new TypeError("Swagger 2.0 does not support null types (" + obj + ").  See https://github.com/swagger-api/swagger-spec/issues/229.")
+    }
     if(item && typeof item.allOf !== 'undefined') {
       var allOf = item.allOf;
       if(_.isArray(allOf)) {