After making context changes and NPE handling.