replaced 'expect' with 'except' where appropriate