Patch up potential NPE in ExtractionHandler. Closes #741