Remove warning.
Handle schema stop better