Update to wait until body is rendered. Fixes intermittent null exception.