Added service exception handling in a few places where I missed it.