Lile improvement on javadoc and type names
Added case to catch null

https://github.com/kfgodel/diamond/issues/39
Merge pull request #41 from kfgodel/39-fix_bad_annotatedType_implementation

39 fix bad annotated type implementation