diff --git a/cmd/iam-etcd-store.go b/cmd/iam-etcd-store.go
index 6be1d824d..ab35dbbcd 100644
--- a/cmd/iam-etcd-store.go
+++ b/cmd/iam-etcd-store.go
@@ -213,7 +213,7 @@ func (ies *IAMEtcdStore) migrateToV1() error {
 		case errConfigNotFound:
 			// Need to migrate to V1.
 		default:
-			return errors.New("corrupt IAM format file")
+			return err
 		}
 	} else {
 		if iamFmt.Version >= iamFormatVersion1 {
diff --git a/cmd/iam-object-store.go b/cmd/iam-object-store.go
index 4ac39a1f6..73ff4efde 100644
--- a/cmd/iam-object-store.go
+++ b/cmd/iam-object-store.go
@@ -127,8 +127,8 @@ func (iamOS *IAMObjectStore) migrateUsersConfigToV1(isSTS bool) error {
 		identityPath := pathJoin(basePrefix, user, iamIdentityFile)
 		var cred auth.Credentials
 		if err := iamOS.loadIAMConfig(&cred, identityPath); err != nil {
-			switch err.(type) {
-			case ObjectNotFound:
+			switch err {
+			case errConfigNotFound:
 				// This should not happen.
 			default:
 				// File may be corrupt or network error
@@ -169,7 +169,7 @@ func (iamOS *IAMObjectStore) migrateToV1() error {
 		case errConfigNotFound:
 			// Need to migrate to V1.
 		default:
-			return errors.New("corrupt IAM format file")
+			return err
 		}
 	} else {
 		if iamFmt.Version >= iamFormatVersion1 {
diff --git a/cmd/xl-v1.go b/cmd/xl-v1.go
index b700650fd..36becad40 100644
--- a/cmd/xl-v1.go
+++ b/cmd/xl-v1.go
@@ -101,6 +101,7 @@ func getDisksInfo(disks []StorageAPI) (disksInfo []DiskInfo, onlineDisks int, of
 	for _, err := range errs {
 		if err != nil {
 			offlineDisks++
+			continue
 		}
 		onlineDisks++
 	}