GH #258 - Added handling of already expired jobs.