Merge pull request #261 from tromey/fix-260

Don't dereference "ecif" before NULL check