Added small javadoc description
Removed unused variable. Throw more correct exception.
Update comment. Null annotation.
Added small class description. Fix typo.