Fixed possible null exception

Merged Miklos Magyari requested to merge nullfix into master

Signed-off-by: Miklos Magyari miklos.magyari@sigmatechnology.se

Merge request reports