Yes I looked at those exception and only replace the inner new exception with these function calls.