Khalid question

I almost never use Khalid / Jaheria so I thought I'd be different and picked them up.

I now remember why I never use them or if I do I kill Khalid off and keep Jaheria. He panics and runs around anytime he stumps his toe. Is there a way before you get the helmet in Durlags Tower to make him not be such a pansy?