Fix: manage null case.
Minor formatting.
Finalize Maven release preparation.