Add logging support
Fix NullPointerException caused by probe failure