Fix of bugs found using "findbugs"
Ex.
NullPointerException