Bugfix NullPointerException