Need to check that a callback was actually set before calling it.

Change-Id: Icb2ca19aec0c74f6695d7286f046dadfe609d68c