Best Major/Minor combo for working in Non-Profits?

So here is a little about what has been going on...I have 4 years experience working in a design company, I attended Art school for a year and decided I wanted to do more than just be a creative. My plans now are to use this design experience in conjunction with maybe communications to find a job working for a non-profit. So currently I'm thinking of majoring in Communications but I'd like to have some financial discipline as well, and I thought Marketing or Advertising would help bring finance and design/creativity together?Any suggestions on a good major/minor combination?