Fix #643: "TypeError: cannot concatenate 'str' and 'NoneType' objects"