Soham | BSHR-109 | Fixing NPE.