Align quality-on-demand with Commonalties regarding optional device object and error messages

Align quality-on-demand with Commonalties regarding optional device object and error messages #207