Fix exceptions caused by code review updates
Merge pull request #54 from Metaswitch/sto443

[No reviewer required] Fix exceptions caused by code review updates