Merge branch 'fix-file-error' into 'dev'

Check for None instead of empty string in pulsar job finish

See merge request !48