Bugfix: prevent npe