More stringent job output handling