Bugfixing for null pointers and String.isEmpty.