Properly catch when accessing old unit
Handle error as error