ZEN-11217: The fix for TypeError: unsupported operand type(s) for *: 'No...

...neType' and 'int'.