remove space

Change-Id: I366074ea101539d9de5d02c9f362868f68b39d57
fix NPE
Test around issue 87... no repro
Merge branch 'koush-authority/master'