BUGFIX: Eliminate possible NullpointerException.