Added extra safety checks in "isComplete" for #474
Merge pull request #476 from SabbeRubbish/2.x

Added extra safety checks in "isComplete" for #474