Add additional fix for el null error.