Minor Bugfix that avoids a NullPointerException currently occuring.