ADD Registration and unregistration errors
FIX Linter errors