FALCON-566 update throwing null job id exception. Contributed by Shwetha GS