Support for not removing OA checks and exception,unit tests added.