+ Bugfix: Prevented nullpointer