Don't worry, your instincts are correct. The only time a comma should follow a conjunction is if there is an interrupting phrase that breaks up the sentence. Example: "He's a nice guy but, to be honest, he smells like a hippopotamus."