KRACOEUS-8140: fixing null pointer on submit