- Some null checks and a slighlty modified report function

Signed-off-by: Daniel Frenzel <dgdanielf@gmail.com>
Merge pull request #2 from dgrat/master

- Some null checks and a slighlty modified report function