Avoid some possible null pointer exceptions and other changes for automatic analisys for find bugs
Avoid some changes for automatic analisys for find bugs