Added another layer of checks
Merge branch 'master' of github.com:kpj/PdfBuilder