diff --git a/src/data/set.cpp b/src/data/set.cpp
index 711b08ab..904d4714 100644
--- a/src/data/set.cpp
+++ b/src/data/set.cpp
@@ -55,7 +55,7 @@ Set::~Set() {}
 
 Context& Set::getContext() {
   assert(wxThread::IsMain());
-  return script_manager->getContext(stylesheet);
+  return script_manager->getContext(CardP());
 }
 Context& Set::getContext(const CardP& card) {
   assert(wxThread::IsMain());
@@ -73,7 +73,7 @@ Context& Set::getContextForThumbnails() {
   if (!thumbnail_script_context) {
     thumbnail_script_context.reset(new SetScriptContext(*this));
   }
-  return thumbnail_script_context->getContext(stylesheet);
+  return thumbnail_script_context->getContext(CardP());
 }
 Context& Set::getContextForThumbnails(const CardP& card) {
   assert(!wxThread::IsMain());
diff --git a/src/script/script_manager.cpp b/src/script/script_manager.cpp
index 1d0c0853..8fc187e9 100644
--- a/src/script/script_manager.cpp
+++ b/src/script/script_manager.cpp
@@ -80,7 +80,7 @@ Context& SetScriptContext::getContext(const CardP& card) {
     ctx.setVariable(SCRIPT_VAR_card,    to_script(card));
     ctx.setVariable(SCRIPT_VAR_styling, to_script(&set.stylingDataFor(card)));
   } else {
-    ctx.setVariable(SCRIPT_VAR_card,    script_nil);
+    ctx.setVariable(SCRIPT_VAR_card,    ScriptValueP());
     ctx.setVariable(SCRIPT_VAR_styling, to_script(&set.stylingDataFor(*stylesheet)));
   }
   return ctx;