Added code to cause null to return 0