bugfix: NullPointerException prevented to optional extras (if there is no extra at all)