Add more useful debugging messages