A way Graves can have his 'cigar'
http://i.imgur.com/5df4i9G.jpg
Turn it into a lollypop (inspired by gintama) and have his taunt be 'this isn't a cigar, it's a lollypop.' before he takes it out and shows us it's a lolly. We may have to compromise and have it become a cigarette instead of a cigar though
confirmed