5.17.1 - Fix scenario when run doesn't exist