diff --git a/src/node.cc b/src/node.cc
index 65de3001593..31c77c0b3b2 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1491,7 +1491,7 @@ static void ReportException(Environment* env, const TryCatch& try_catch) {
 // Executes a str within the current v8 context.
 static Local<Value> ExecuteString(Environment* env,
                                   Handle<String> source,
-                                  Handle<Value> filename) {
+                                  Handle<String> filename) {
   EscapableHandleScope scope(env->isolate());
   TryCatch try_catch;
 
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index f552387ed28..0f07e57d4fe 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -51,8 +51,11 @@ using v8::ObjectTemplate;
 using v8::Persistent;
 using v8::PropertyCallbackInfo;
 using v8::Script;
+using v8::ScriptCompiler;
+using v8::ScriptOrigin;
 using v8::String;
 using v8::TryCatch;
+using v8::UnboundScript;
 using v8::V8;
 using v8::Value;
 using v8::WeakCallbackData;
@@ -430,7 +433,7 @@ class ContextifyContext {
 
 class ContextifyScript : public BaseObject {
  private:
-  Persistent<Script> script_;
+  Persistent<UnboundScript> script_;
 
  public:
   static void Init(Environment* env, Local<Object> target) {
@@ -473,10 +476,10 @@ class ContextifyScript : public BaseObject {
       return;
     }
 
-    Local<Context> context = env->context();
-    Context::Scope context_scope(context);
-
-    Local<Script> v8_script = Script::New(code, filename);
+    ScriptOrigin origin(filename);
+    ScriptCompiler::Source source(code, origin);
+    Local<UnboundScript> v8_script =
+        ScriptCompiler::CompileUnbound(env->isolate(), &source);
 
     if (v8_script.IsEmpty()) {
       if (display_errors) {
@@ -639,8 +642,9 @@ class ContextifyScript : public BaseObject {
 
     ContextifyScript* wrapped_script =
         Unwrap<ContextifyScript>(args.This());
-    Local<Script> script = PersistentToLocal(env->isolate(),
-                                             wrapped_script->script_);
+    Local<UnboundScript> unbound_script =
+        PersistentToLocal(env->isolate(), wrapped_script->script_);
+    Local<Script> script = unbound_script->BindToCurrentContext();
 
     Local<Value> result;
     if (timeout != -1) {
diff --git a/test/simple/test-vm-syntax-error-stderr.js b/test/simple/test-vm-syntax-error-stderr.js
index a5f73111493..3e88e1ff105 100644
--- a/test/simple/test-vm-syntax-error-stderr.js
+++ b/test/simple/test-vm-syntax-error-stderr.js
@@ -45,5 +45,5 @@ p.stdout.on('data', function(data) {
 process.on('exit', function() {
   assert(/BEGIN CERT/.test(output));
   assert(/^\s+\^/m.test(output));
-  assert(/Unexpected identifier/.test(output));
+  assert(/Invalid left-hand side expression in prefix operation/.test(output));
 });