Better notification of expected objects

Change-Id: I638e130eaa1695cdeef9656ad5c452a92f08feea