1228c1228,1231
< cpu->trap(inst_fault, tid, head_inst->staticInst);
---
> cpu->trap(inst_fault, tid,
> head_inst->notAnInst() ?
> StaticInst::nullStaticInstPtr :
> head_inst->staticInst);