Also, I've now added protection against the convert problem and a unit test to cover it :)