This prevents clobbering of non recoverable error return codes while retaining intended functionality of commit 65103efe