Webapp update fails giving an NPE - issue fix