[6.15.z] Only the second call should raise an exception

[6.15.z] Only the second call should raise an exception #9428