Minor error condition check fixes