Clean up, now without compile NullPointer exceptions. I do not know why they occured before.