Raise an error if both msg and message are passed in

Fixed up as per Tres' comment on the previous pull request. refs #64