Bad refactoring meant string/NoneType concatenation troubles