Add some extra debug if things go wrong