Fix a NPE occuring on SU deployment