Feature/kaa 120

Maybe we should check if arguments are not null pointers?