Fixing handling with None and not None values