Cleanup code

[arefbehboudi]

• I added Assert.notNull to places where it was missing.
• Removed unnecessary throw Exception statements.
• I made the variables final, where they were only defined once.

[mp911de]

Thank you for your contribution. That's merged, polished, and backported now.