Support nil object queries

@tgoyne