SWITCHYARD-1517 - Fixing a couple of NPEs in the security property pages