A bit more debug information + bug with null pointer