Service container exceptions

Includes docs work