Auto discovery errors our on my Yamaha RX-V681

HASS is showing auto discovery errors in the logs while trying to discover my Yamaha RX-V681 receiver, both when installing HASS with Hassbian and with the all-in-one approach on top of Raspbian. It looks like my receiver is not responding with data expected by the yamaha.py code. My receiver should be compatible. Where do I start looking?

17-04-15 07:17:16 WARNING (Recorder) [homeassistant.components.recorder] Ended unfinished session (id=1 from 2017-04-14 23:20:24.153489)
17-04-15 07:26:00 ERROR (MainThread) [homeassistant.core] Error doing job: Task exception was never retrieved
Traceback (most recent call last):
  File "/usr/lib/python3.4/asyncio/tasks.py", line 233, in _step
    result = coro.throw(exc)
  File "/srv/homeassistant/homeassistant_venv/lib/python3.4/site-packages/homeassistant/components/discovery.py", line 112, in scan_devices
    None, _discover, netdisco)
  File "/usr/lib/python3.4/asyncio/futures.py", line 388, in __iter__
    yield self  # This tells Task to wait for completion.
  File "/usr/lib/python3.4/asyncio/tasks.py", line 286, in _wakeup
    value = future.result()
  File "/usr/lib/python3.4/asyncio/futures.py", line 277, in result
    raise self._exception
  File "/usr/lib/python3.4/concurrent/futures/thread.py", line 54, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/srv/homeassistant/homeassistant_venv/lib/python3.4/site-packages/homeassistant/components/discovery.py", line 137, in _discover
    for service in netdisco.get_info(disc):
  File "/home/homeassistant/.homeassistant/deps/netdisco/discovery.py", line 104, in get_info
    return self.discoverables[dis].get_info()
  File "/home/homeassistant/.homeassistant/deps/netdisco/discoverables/__init__.py", line 40, in get_info
    self.info_from_entry(entry) for entry in self.get_entries()))
  File "/home/homeassistant/.homeassistant/deps/netdisco/discoverables/__init__.py", line 40, in <genexpr>
    self.info_from_entry(entry) for entry in self.get_entries()))
  File "/home/homeassistant/.homeassistant/deps/netdisco/discoverables/yamaha.py", line 13, in info_from_entry
    yam['X_serviceList']['X_service']['X_controlURL'][1:])
TypeError: list indices must be integers, not str

Did you ever solve this?
Having similar issues i my config.