Added safeguards to callback decorator / projection.