Not stoked on this as a resolution for issue # 5 on #950, but it does seem to do the trick.  It's passable, but the root issue requires more investigation.
Resolve some undefined index errors.