lib/coderunner/run.rb in coderunner-0.15.1 vs lib/coderunner/run.rb in coderunner-0.15.2

@@ -361,10 +361,10 @@
 # Cache the run object in the file <tt>.code_runner_run_data</tt>
 
 def save
 	
 	logf(:save)
-	raise CRFatal.new("Something has gone horribly wrong: runner.class is #{@runner.class} instead of CodeRunner") unless @runner.class.to_s == "CodeRunner"
+	raise CRFatal.new("Something has gone horribly wrong: runner.class is #{@runner.class} instead of CodeRunner") unless @runner.class.to_s =~ /^CodeRunner(::Merged)?/
 	runner, @runner = @runner, nil
 	@system_triers, old_triers = nil, @system_triers
 	@component_runs.each{|run| run.runner = nil} if @component_runs
 	#@component_runs.each{|run| run.runner = nil} if @component_runs
 # 	logi(self)