Bugfix: NullPointerException