Fix NullPointerException
Make final some fields