Fix for null object issue
Merge branch 'develop' of https://github.com/clearpath-networks/cloudflash-bolt into develop