B.,
Go to him. Pick him up. he is scared. I know, I know, everyone else tells you you can't, you'll spoil him, you'll ruin all the work he did to sleep on his own.
Attachment parenting international. check out their website. they have a lot of ideas and tactics for helping your baby out of this stage.
I learned so much here and my baby has only benefited. he is just getting so outgoing, people are amazed. He isn't waking as often as he used to though. That is the important part.
Please email if you have questions. Not everyone believes that children have needs and rights beyond nursing, and it is hard to sort out what is good for your baby vs what is good for the parents.
Another source is Scott Noelle. He has free emails that have been so uplifting and enlightening when it comes to avoiding the 'terrible two's' Everyone has remarked that my son seems to be skipping them!
Good luck, and happy hunting. This is not an easy issue for a lot of reasons.
M.