Update: Use a better either algorithm that checks for null strings

Update: Use a better either algorithm that checks for null strings #324