Fixed errors caused by calling an empty delegate.
Merge branch 'ragdoll'