Fixed another bug where non existant register can cause issue