BUGFIX: Nullpointer

Signed-off-by: Tobias <pahlings@gmail.com>

Change-Id: Icdb1a34358f7d0131e99d1c43b7bb2823d29ee22