reduce logging and fix potential NPE
Merge pull request #398 from zanata/small-fix

reduce logging and fix potential NPE