Terceiro commit, NPE EVERYWHERE
Terceiro commit, NPE EVERYWHERE