Commit 5cedda5e4a3f726168b87d357aee723e6fd919cd

Rod Sheeter 2019-05-16T19:16:52

[subset] Fix null pointer deref, tidy up a bit