Add support for default_handling=CONTINUE