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

Added extra safety checks in "isComplete" for #474
Merge branch '2.x' into 2.6