Fixing some NPEs + consolidating some code

git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/branches/1.5.x-fixes@1611033 13f79535-47bb-0310-9956-ffa450edef68