Thanks Manu, that seems to have resolved the issue but I now seem to have new error relating to a stack overflow. I've just submitted a problem report (#15274).