FIX - NPE / UI