Fixed bug of usage String.isEmpty method which is prohibited for old android devices
Fixed null pointer exceptions
hotfix
merging bugfixing and master