Improve exception handling and provide control over whether exceptions
are sent to the client
Remove unused import
Integration