commit - Some more safeguard then selecting iconv translation

[Henrik Berg]

Nothing realy. Just a little more error checking
--hb