minor refactoring
Merge remote-tracking branch 'origin/master'
added logging and null pointer id check