Add some extra logging