diff --git a/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs b/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs
index 73a3a62..42dbde1 100644
--- a/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs
+++ b/src/nuget-cli/UploadFilesToServerUsingWebRequest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -16,7 +15,6 @@ namespace nuget_cli
         internal async Task UploadFilesToServerAsync(PushReport report, Uri uri, FileInfo fi,
        string apikey)
         {
-
             // string formdataTemplate = "Content-Disposition: form-data; name=\"{0}\"\r\n\r\n{1}";
             const int TXLEN = 0x1000;
             /// the form-data file upload, properly formatted
@@ -64,41 +62,9 @@ namespace nuget_cli
                             }
                         }
                         requestStream.Write(trailer, 0, trailer.Length);
-                        //requestStream.Close();
+                        requestStream.Close();
                     }
-                    request.BeginGetResponse(a =>
-                    {
-                        try
-                        {
-                            var response = request.EndGetResponse(a);
-                            var responseStream = response.GetResponseStream();
-                            using (var sr = new StreamReader(responseStream))
-                            {
-                                using (StreamReader streamReader = new StreamReader(response.GetResponseStream()))
-                                {
-                                    string responseString = streamReader.ReadToEnd();
-                                    //responseString is depend upon your web service.
-                                    if (responseString == "Success")
-                                    {
-                                        report.Message = "stored successfully on server.";
-                                    }
-                                    else
-                                    {
-                                        report.Message = "Error occurred while uploading packet on server.";
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            report.Message = ex.Message;
-                            Console.Error.WriteLine(ex.Message);
-#if DEBUG
-                            Console.Error.WriteLine("Stack trace:");
-                            Console.Error.WriteLine(ex.StackTrace);
-#endif
-                        }
-                    }, null);
+                    
                 }
                 catch (Exception rex)
                 {
@@ -112,19 +78,16 @@ namespace nuget_cli
             }, httpWebRequest);
 
             WebResponse resp = httpWebRequest.GetResponse();
+            
             Stream stream = resp.GetResponseStream();
             StreamReader re = new StreamReader(stream);
-            String json = re.ReadToEnd();
-            report.Message = json;
-        }
-
-        /// <summary>
-        /// Writes string to stream. Author : Farhan Ghumra
-        /// </summary>
-        private static void WriteToStream(Stream s, string txt)
-        {
-            byte[] bytes = Encoding.UTF8.GetBytes(txt);
-            s.Write(bytes, 0, bytes.Length);
+            if (resp is HttpWebResponse)
+            {
+               String json = re.ReadToEnd();
+               report.Message = json;
+               report.StatusCode = (resp as HttpWebResponse).StatusCode.ToString();
+            }
+            else throw new Exception("Invalid server response type");
         }
 
         /// <summary>