CLC-1852 Strengthen HotPlate against exceptions; improve test coverage
Merge pull request #1100 from ctweney/clc-1852

CLC-1852 Strengthen HotPlate against exceptions; improve test coverage