Fixing issues with None lis