Empty string should not be returned as None