Will hopefully no longer explode because of null-pointers