With my last set of changes I created a couple empty if / else: cases which throw errors.  Oops.  Fixed now.