Minor Change into the Internal Exception Handling of the API.