- Some null checks and a slighlty modified report function

Signed-off-by: Daniel Frenzel <dgdanielf@gmail.com>