Added test and fix for strings being handled as iterables and throwing a...

...n exception when changed to None