SPOT-1308

Dropping invalid characters as they come in.