Merge pull request #777 from sr-gi/cm-force-close-checks