avoiding NPE + few more generics

git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/trunk@1607310 13f79535-47bb-0310-9956-ffa450edef68