Major bug fix - before it raised a traceback, now works.