#455 fix. Issues that found by Codecy were fixed
#455 fix. Issues that found by Codecy were fixed

SrinivasanTarget/java-client,SrinivasanTarget/java-client,SrinivasanTarget/java-client,TikhomirovSergey/java-client,TikhomirovSergey/java-client,saikrishna321/java-client,appium/java-client,saikrishna321/java-client,saikrishna321/java-client,SrinivasanTarget/java-client,appium/java-client,saikrishna321/java-client,TikhomirovSergey/java-client,TikhomirovSergey/java-client