Change null logic, add Hobsons Bay