Release 0.9.17.02 (also fixing a minor null check)