Bugfix for SafeCaller.
Bugfix for SafeCaller.

arnoutpierre/rtv,michael-lazar/rtv,TheoPib/rtv,5225225/rtv,shaggytwodope/rtv,5225225/rtv,yskmt/rtv,shaggytwodope/rtv,michael-lazar/rtv,Brobin/rtv,bigplus/rtv,obosob/rtv,michael-lazar/rtv,TheoPib/rtv,tobywhughes/rtv,yskmt/rtv