#679 - Bug fixes for error scenarios on stages and job pages