New requirements and REST exception fix.