SWC-1235: fix cell width and add better error handling to registration