Add class name to debug msg
Change msgs (makes output a bit nicer and more readable)
Prevent NPE
Merge pull request #366 from OndraZizka/master

Add class name to debug msg