Add guard to check existence of unnamedplus register.
Do some housekeeping