PROBCORE-381 Fixed major bug in submitting
PROBCORE-381 Better exception handling