tightened up guards on mpd commands.