Fix cp669

Added check for None in assignment on members