diff --git a/src/storage/storage.android.ts b/src/storage/storage.android.ts
index 737390fa..ad2ee27f 100644
--- a/src/storage/storage.android.ts
+++ b/src/storage/storage.android.ts
@@ -11,7 +11,7 @@ function getReference(nativeReference: com.google.firebase.storage.StorageRefere
     bucket: nativeReference.getBucket(),
     name: nativeReference.getName(),
     fullPath: nativeReference.getPath(),
-    listAll: (): Promise<ListResult> => listAll({remoteFullPath: nativeReference.getPath(), bucket: listOptions.bucket})
+    listAll: (): Promise<ListResult> => listAll({ remoteFullPath: nativeReference.getPath(), bucket: listOptions.bucket })
   }
 }
 
@@ -56,7 +56,7 @@ function getStorageRef(reject, arg) {
   }
 }
 
-export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
+export function uploadFile(arg: UploadFileOptions): Promise<any> {
   return new Promise((resolve, reject) => {
     try {
 
@@ -85,7 +85,7 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
 
       const onFailureListener = new gmsTasks.OnFailureListener({
         onFailure: exception => {
-          reject("Upload failed. " + exception);
+          reject(exception);
         }
       });
 
@@ -110,9 +110,9 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
         // using 'putFile' (not 'putBytes') so Firebase can infer the mimetype
         const localFileUrl = android.net.Uri.fromFile(new java.io.File(arg.localFile.path));
         storageReference.putFile(localFileUrl)
-            .addOnFailureListener(onFailureListener)
-            .addOnSuccessListener(onSuccessListener)
-            .addOnProgressListener(onProgressListener);
+          .addOnFailureListener(onFailureListener)
+          .addOnSuccessListener(onSuccessListener)
+          .addOnProgressListener(onProgressListener);
 
         /*
         var error;
@@ -138,9 +138,9 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
 
         const localFileUrl = android.net.Uri.fromFile(new java.io.File(arg.localFullPath));
         storageReference.putFile(localFileUrl)
-            .addOnFailureListener(onFailureListener)
-            .addOnSuccessListener(onSuccessListener)
-            .addOnProgressListener(onProgressListener);
+          .addOnFailureListener(onFailureListener)
+          .addOnSuccessListener(onSuccessListener)
+          .addOnProgressListener(onProgressListener);
 
       } else {
         reject("One of localFile or localFullPath is required");
@@ -153,7 +153,7 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
   });
 }
 
-export function downloadFile(arg: DownloadFileOptions): Promise<string> {
+export function downloadFile(arg: DownloadFileOptions): Promise<any> {
   return new Promise((resolve, reject) => {
     try {
 
@@ -170,7 +170,7 @@ export function downloadFile(arg: DownloadFileOptions): Promise<string> {
       });
 
       const onFailureListener = new gmsTasks.OnFailureListener({
-        onFailure: exception => reject("Download failed. " + exception)
+        onFailure: exception => reject(exception)
       });
 
       let localFilePath;
@@ -193,8 +193,8 @@ export function downloadFile(arg: DownloadFileOptions): Promise<string> {
       const file = new java.io.File(localFilePath);
 
       storageReference.getFile(file)
-          .addOnSuccessListener(onSuccessListener)
-          .addOnFailureListener(onFailureListener);
+        .addOnSuccessListener(onSuccessListener)
+        .addOnFailureListener(onFailureListener);
 
     } catch (ex) {
       console.log("Error in firebase.downloadFile: " + ex);
@@ -203,7 +203,7 @@ export function downloadFile(arg: DownloadFileOptions): Promise<string> {
   });
 }
 
-export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<string> {
+export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<any> {
   return new Promise((resolve, reject) => {
     try {
 
@@ -223,13 +223,13 @@ export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<string> {
 
       const onFailureListener = new gmsTasks.OnFailureListener({
         onFailure: exception => {
-          reject(exception.getMessage());
+          reject(exception);
         }
       });
 
       storageReference.getDownloadUrl()
-          .addOnSuccessListener(onSuccessListener)
-          .addOnFailureListener(onFailureListener);
+        .addOnSuccessListener(onSuccessListener)
+        .addOnFailureListener(onFailureListener);
 
     } catch (ex) {
       console.log("Error in firebase.getDownloadUrl: " + ex);
@@ -238,8 +238,8 @@ export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<string> {
   });
 }
 
-export function deleteFile(arg: DeleteFileOptions): Promise<void> {
-  return new Promise<void>((resolve, reject) => {
+export function deleteFile(arg: DeleteFileOptions): Promise<any> {
+  return new Promise<any>((resolve, reject) => {
     try {
 
       const storageRef = getStorageRef(reject, arg);
@@ -258,13 +258,13 @@ export function deleteFile(arg: DeleteFileOptions): Promise<void> {
 
       const onFailureListener = new gmsTasks.OnFailureListener({
         onFailure: exception => {
-          reject(exception.getMessage());
+          reject(exception);
         }
       });
 
       storageReference.delete()
-          .addOnSuccessListener(onSuccessListener)
-          .addOnFailureListener(onFailureListener);
+        .addOnSuccessListener(onSuccessListener)
+        .addOnFailureListener(onFailureListener);
 
     } catch (ex) {
       console.log("Error in firebase.deleteFile: " + ex);
@@ -273,8 +273,8 @@ export function deleteFile(arg: DeleteFileOptions): Promise<void> {
   });
 }
 
-export function listAll(listOptions: ListOptions): Promise<ListResult> {
-  return new Promise<ListResult>((resolve, reject) => {
+export function listAll(listOptions: ListOptions): Promise<any> {
+  return new Promise<any>((resolve, reject) => {
     try {
       const storageRef = getStorageRef(reject, listOptions);
 
@@ -288,15 +288,15 @@ export function listAll(listOptions: ListOptions): Promise<ListResult> {
 
       const onFailureListener = new gmsTasks.OnFailureListener({
         onFailure: exception => {
-          reject(exception.getCause() ? exception.getCause().getMessage() : exception.getMessage());
+          reject(exception);
         }
       });
 
       const storageReference = storageRef.child(listOptions.remoteFullPath);
 
       storageReference.listAll()
-          .addOnSuccessListener(onSuccessListener)
-          .addOnFailureListener(onFailureListener);
+        .addOnSuccessListener(onSuccessListener)
+        .addOnFailureListener(onFailureListener);
 
     } catch (ex) {
       console.log("Error in firebase.listAll: " + ex);
diff --git a/src/storage/storage.ios.ts b/src/storage/storage.ios.ts
index 211a61bd..855c7ccc 100644
--- a/src/storage/storage.ios.ts
+++ b/src/storage/storage.ios.ts
@@ -8,7 +8,7 @@ function getReference(nativeReference: FIRStorageReference, listOptions: ListOpt
     bucket: nativeReference.bucket,
     name: nativeReference.name,
     fullPath: nativeReference.fullPath,
-    listAll: (): Promise<ListResult> => listAll({remoteFullPath: nativeReference.fullPath, bucket: listOptions.bucket})
+    listAll: (): Promise<ListResult> => listAll({ remoteFullPath: nativeReference.fullPath, bucket: listOptions.bucket })
   };
 }
 
@@ -53,12 +53,12 @@ function getStorageRef(reject, arg): FIRStorageReference {
   }
 }
 
-export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
+export function uploadFile(arg: UploadFileOptions): Promise<any> {
   return new Promise((resolve, reject) => {
     try {
       const onCompletion = (metadata: FIRStorageMetadata, error: NSError) => {
         if (error) {
-          reject(error.localizedDescription);
+          reject(error);
         } else {
           resolve({
             name: metadata.name,
@@ -117,12 +117,12 @@ export function uploadFile(arg: UploadFileOptions): Promise<UploadFileResult> {
   });
 }
 
-export function downloadFile(arg: DownloadFileOptions): Promise<string> {
+export function downloadFile(arg: DownloadFileOptions): Promise<any> {
   return new Promise((resolve, reject) => {
     try {
       const onCompletion = (url, error) => {
         if (error) {
-          reject(error.localizedDescription);
+          reject(error);
         } else {
           resolve(url.absoluteString);
         }
@@ -164,12 +164,12 @@ export function downloadFile(arg: DownloadFileOptions): Promise<string> {
   });
 }
 
-export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<string> {
+export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<any> {
   return new Promise((resolve, reject) => {
     try {
       const onCompletion = (url, error) => {
         if (error) {
-          reject(error.localizedDescription);
+          reject(error);
         } else {
           resolve(url.absoluteString);
         }
@@ -191,12 +191,12 @@ export function getDownloadUrl(arg: GetDownloadUrlOptions): Promise<string> {
   });
 }
 
-export function deleteFile(arg: DeleteFileOptions): Promise<void> {
-  return new Promise<void>((resolve, reject) => {
+export function deleteFile(arg: DeleteFileOptions): Promise<any> {
+  return new Promise<any>((resolve, reject) => {
     try {
       const onCompletion = error => {
         if (error) {
-          reject(error.localizedDescription);
+          reject(error);
         } else {
           resolve();
         }
@@ -232,7 +232,7 @@ export function listAll(listOptions: ListOptions): Promise<ListResult> {
 
       fIRStorageReference.listAllWithCompletion((result: FIRStorageListResult, error: NSError) => {
         if (error) {
-          reject(error.localizedDescription);
+          reject(error);
         } else {
           resolve(new ListResult(result, listOptions));
         }