bug fix nullreferenzexception