Added checks for registration; improved status handling