Fixed reflection warnings
Nil and empty/trimmed string short circuiting