added exceptions to rest-layer