(Some comment / code formatting / Manual cleanup)
Fixed NPE when the TLD is loaded without ObjectWrapper
(Some comment / code formatting cleanup)