Fixed some null pointers exceptions
Merge branch 'master' of https://github.com/otudor/WSTester.git