Add null check for zvals in callable matches

Fixes #8