null checking
Merge branch 'qa' of https://github.com/ThomsonLocal/services-api into qa