minors
fix intermittent NPE on concurrent deletes/queries