Fix NPE comming from null Integer's