Handle no draft
Handle no draft