Fix for #1485 - translation of None chokes.