Add some safety for the callback invocation
v2.4.2