Added missed null variable check and the fix for
https://issues.infn.it/jira/browse/STOR-310
Merge branch '1.11.x' of https://github.com/italiangrid/storm.git into 1.11.x