Fixing return null.
Fixing String comparison.