simplify and avoid NPEs

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/bcel/trunk@1532202 13f79535-47bb-0310-9956-ffa450edef68