fixed product view null check