SWC-1771: do a precheck
Merge pull request #1239 from jay-hodgson/SWC-1771

SWC-1771: do a precheck