adding try/catch in controllers and tests
merge