Added more logging in 749c770fc403ac201111655313f0e6208b423048