#679 - Bug fixes for error scenarios on stages and job pages
#679 - removed comment
removing 'and return' during render and this is anyway the last line in the method
Merge pull request #693 from jyotisingh/bug_fixes

Bug fixes