added check for list.adapter == bull, no more exceptions
Merge branch 'DA-303' into unstable

* DA-303:
  added check for list.adapter == bull, no more exceptions
fixed references