#41 - null handle broke term indexing