Fixed: NullPointerException when reached end of scenario