Moved exception handling to schema