Merge branch 'develop'

src/app/SharpRaven/Data/JsonPacket.cs

@@ -30,6 +30,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 
 using Newtonsoft.Json;
 
@@ -82,6 +83,18 @@ public JsonPacket(string project, Exception exception)
 
                 Exceptions.Add(sentryException);
             }
+
+            // ReflectionTypeLoadException doesn't contain much useful info in itself, and needs special handling
+            ReflectionTypeLoadException reflectionTypeLoadException = exception as ReflectionTypeLoadException;
+            if (reflectionTypeLoadException != null)
+            {
+                foreach (Exception loaderException in reflectionTypeLoadException.LoaderExceptions)
+                {
+                    SentryException sentryException = new SentryException(loaderException);
+
+                    Exceptions.Add(sentryException);
+                }
+            }
         }
 
 

src/app/SharpRaven/Data/SentryRequest.cs

@@ -149,8 +149,17 @@ private static bool HasHttpContext
         /// </returns>
         public static SentryRequest GetRequest()
         {
-            var request = new SentryRequest();
-            return HasHttpContext ? request : null;
+            try
+            {
+                var request = new SentryRequest();
+                return HasHttpContext ? request : null;
+            }
+            catch (Exception exception)
+            {
+                Console.WriteLine(exception);
+            }
+
+            return null;
         }