Minor changes following last commit, including moving exception mapper to lambda-serving