Fix #8: restore state checks for not set adapter