More edits for Sonar style compliance, added null checks where appropriate and more JavaDocs, removed unnecessary exceptions in throws clauses