fix str_or_none

Method was suppose to return string if input string was non-empty
string. Not empty string.
Simplify code.