SWC-1728: fix registration error handling