diff --git a/Makefile b/Makefile
index fa6904534..d7c0f7b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -749,8 +749,8 @@ OBJS += passes/cmds/splitcells.o
 OBJS += passes/cmds/splitfanout.o
 OBJS += passes/cmds/splitnets.o
 OBJS += passes/cmds/tee.o
+OBJS += passes/cmds/activity.o
 OBJS += passes/sat/sim.o
-OBJS += passes/sat/activity.o
 
 include $(YOSYS_SRC)/passes/hierarchy/Makefile.inc
 include $(YOSYS_SRC)/passes/memory/Makefile.inc
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 46614cd4f..2b4bce71f 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -2516,7 +2516,7 @@ struct AnnotateActivity : public OutputWriter {
 			},
 			[this, use_signal, dataMap, max_time, real_timescale, clk_period, debug]
 			  (const char *name, int size, Wire *w, int id, bool is_reg) {
-				if (!use_signal.at(id))
+				if (!use_signal.at(id) || (w == nullptr))
 					return;
 				std::string full_name = form_vcd_name(name, size, w);
 				SignalActivityDataMap::const_iterator itr = dataMap.find(id);