A fix for the fix.  Forgot to handle nulls.