[TIDOC-1033] Fix random errors
Merge pull request #3881 from bhatfield/tidoc-1033

[TIDOC-1033] Fix some random issues causing warning message to appear