Fix cyclic dependency error

While I'm here fix error message.

Merge:	releng/9.1.0
(cherry picked from commit c7ed51fc827678a28b29387e348f92b0e4d5334b)