Adding some logging to figure out why it's choking...