Fixed: TypeError: Argument 1 does not allow None as a value