Fixed: 'NoneType' object has no attribute 'value'