Crash fix for a case where the EndCallback is not set and used
Merge pull request #209 from robUx4/endcallback_npe_fix

Crash fix for a case where the EndCallback is not set and used