Merge "Add check for whether the Renderer has been created." into devel/master