fix cell width and add better error handling to registration
Merge pull request #862 from jay-hodgson/SWC-1235

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