Merge pull request #2 from bd2019us/prwork

Use Objects.equals(String,String) to avoid possible NullPointerException