Make call more safe