Merge branch 'colorcrash'

598e9df2 · Marcin Cieslak · 255d8184 · 7c73b7ee · 598e9df2
Commit 598e9df2 authored Aug 20, 2015 by Marcin Cieslak
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

sass_value_wrapper.h src/sass_types/sass_value_wrapper.h +6 -2

No files found.
--- a/src/sass_types/sass_value_wrapper.h
+++ b/src/sass_types/sass_value_wrapper.h
@@ -106,8 +106,12 @@ namespace SassTypes
      }
    } else {
      v8::Local<v8::Function> cons = T::get_constructor();
-      v8::Local<v8::Object> inst = Nan::NewInstance(cons, info.Length(), &localArgs[0]).ToLocalChecked();
+      v8::Local<v8::Object> inst;
-      info.GetReturnValue().Set(inst);
+      if (Nan::NewInstance(cons, info.Length(), &localArgs[0]).ToLocal(&inst)) {
+        info.GetReturnValue().Set(inst);
+      } else {
+        info.GetReturnValue().Set(Nan::Undefined());
+      }
    }
  }