diff --git a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt
index 2ee5d139..6c0994ad 100644
--- a/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt
+++ b/storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/NonGmsFileRemoteDataSourceImpl.kt
@@ -6,6 +6,8 @@ import com.omh.android.storage.api.domain.model.OmhFile
 import com.omh.android.storage.api.domain.model.OmhStorageException
 import com.omh.android.storage.api.domain.model.OmhStorageStatusCodes.DOWNLOAD_ERROR
 import com.omh.android.storage.api.domain.model.OmhStorageStatusCodes.DOWNLOAD_GOOGLE_WORKSPACE_ERROR
+import com.omh.android.storage.api.domain.model.OmhStorageStatusCodes.UPDATE_CONTENT_FILE
+import com.omh.android.storage.api.domain.model.OmhStorageStatusCodes.UPDATE_META_DATA
 import com.omh.android.storage.api.drive.nongms.data.GoogleRetrofitImpl
 import com.omh.android.storage.api.drive.nongms.data.GoogleStorageApiService
 import com.omh.android.storage.api.drive.nongms.data.source.body.CreateFileRequestBody
@@ -159,7 +161,6 @@ internal class NonGmsFileRemoteDataSourceImpl(private val retrofitImpl: GoogleRe
         val jsonMetaData = JSONObject().apply {
             put(FILE_NAME_KEY, localFileToUpload.name)
             put(FILE_PARENTS_KEY, parentId.isNullOrBlank())
-            put("description", "TEST HANS VIII")
         }
 
         val jsonRequestBody = jsonMetaData.toString().toRequestBody(JSON_MIME_TYPE)
@@ -172,7 +173,8 @@ internal class NonGmsFileRemoteDataSourceImpl(private val retrofitImpl: GoogleRe
             val omhFile = response.body()?.toFile()
             updateMediaFile(localFileToUpload, omhFile)
         } else {
-            null
+            val errorBody = response.errorBody()?.string().orEmpty()
+            throw (OmhStorageException.DownloadException(UPDATE_META_DATA, errorBody))
         }
     }
 
@@ -195,7 +197,8 @@ internal class NonGmsFileRemoteDataSourceImpl(private val retrofitImpl: GoogleRe
         return if (response.isSuccessful) {
             response.body()?.toFile()
         } else {
-            null
+            val errorBody = response.errorBody()?.string().orEmpty()
+            throw (OmhStorageException.DownloadException(UPDATE_CONTENT_FILE, errorBody))
         }
     }
 }
diff --git a/storage-api/src/main/java/com/omh/android/storage/api/domain/model/OmhStorageStatusCodes.kt b/storage-api/src/main/java/com/omh/android/storage/api/domain/model/OmhStorageStatusCodes.kt
index b6c4f1d1..9f87058f 100644
--- a/storage-api/src/main/java/com/omh/android/storage/api/domain/model/OmhStorageStatusCodes.kt
+++ b/storage-api/src/main/java/com/omh/android/storage/api/domain/model/OmhStorageStatusCodes.kt
@@ -4,12 +4,16 @@ object OmhStorageStatusCodes {
 
     const val DOWNLOAD_ERROR = 1
     const val DOWNLOAD_GOOGLE_WORKSPACE_ERROR = 2
+    const val UPDATE_META_DATA = 3
+    const val UPDATE_CONTENT_FILE = 4
 
     @JvmStatic
     fun getStatusCodeString(code: Int): String {
         return when (code) {
             DOWNLOAD_ERROR -> "Download error."
             DOWNLOAD_GOOGLE_WORKSPACE_ERROR -> "Download Google Workspace error."
+            UPDATE_META_DATA -> "Update meta data error."
+            UPDATE_CONTENT_FILE -> "Update content file error."
             else -> "Unknown status code: $code"
         }
     }