wire debug disabled
NPE protection
Merge pull request #13 from jbaruch/master

small changes