Merge pull request #21 from 30x/XAPID-862

XPID-862: make sure we log things properly.