Fix for issue 21534
Fix for 21534
Dealing with failed push