Here’s what I think you can do:
a) Rather than getting upset, I would not let him affect me. If you get upset, you are not doing anything good to you.
b) Start giving him a different reaction when he scolds you. Start apologizing profusely, thank him for his guidance… just do something different than what you are doing right now.
c) Ask him you need to talk to him but on a coffee break. Can you do that? I don’t know if you are that assertive. Share your discomfort with him and see what he has to say.
d) Discuss this with a senior member in your company.
e) Discuss this with your HR spoc.
f) Write him a formal e-mail…. But make it very polite and diplomatic.
g) See, if there is any truth in what he is saying… Do you upset him with anything?
h) Lastly, if everything fails, look out for a change…
With the limited information you have given, I can only suggest this. May be you can call me in case you want to discuss this further.. All the best!