Updates to add enhanced google exception handling where available.