[hardwrap addon] Prevent null-use error in corner case

Closes #2070