diff --git a/HADotNet.Core.Tests/HADotNet.Core.Tests.csproj b/HADotNet.Core.Tests/HADotNet.Core.Tests.csproj
index 458e4a2..96099c0 100644
--- a/HADotNet.Core.Tests/HADotNet.Core.Tests.csproj
+++ b/HADotNet.Core.Tests/HADotNet.Core.Tests.csproj
@@ -5,6 +5,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
diff --git a/HADotNet.Core.Tests/InfoTests.cs b/HADotNet.Core.Tests/InfoTests.cs
index 632208b..ba1a613 100644
--- a/HADotNet.Core.Tests/InfoTests.cs
+++ b/HADotNet.Core.Tests/InfoTests.cs
@@ -1,10 +1,18 @@
 using System;
 using System.Threading.Tasks;
 using HADotNet.Core.Clients;
+using HADotNet.Core.Domain;
 using NUnit.Framework;
 
 namespace HADotNet.Core.Tests
 {
+    /// <summary>
+    /// Tests for the Supervisor Info endpoints.
+    /// </summary>
+    /// <remarks>
+    /// NOTE: If you want to test against a non-Supervisor instance, you'll need to set
+    /// the compilation symbol TEST_ENV_HA_CORE which will test for the correct exception.
+    /// </remarks>
     public class InfoTests
     {
         private Uri Instance { get; set; }
@@ -22,25 +30,33 @@ public void Setup()
         [Test]
         public async Task ShouldRetrieveSupervisorInfo()
         {
-            var client = ClientFactory.GetClient<InfoClient>();
-
+            var client = ClientFactory.GetClient<InfoClient>();
+
+#if TEST_ENV_HA_CORE
+            Assert.ThrowsAsync<SupervisorNotFoundException>(async () => await client.GetSupervisorInfo());
+#else
             var info = await client.GetSupervisorInfo();
 
             Assert.AreEqual("ok", info.Result);
             Assert.IsNotNull(info.Data);
             Assert.IsNotNull(info.Data.Version);
+#endif
         }
 
         [Test]
         public async Task ShouldRetrieveHostInfo()
         {
-            var client = ClientFactory.GetClient<InfoClient>();
-
+            var client = ClientFactory.GetClient<InfoClient>();
+
+#if TEST_ENV_HA_CORE
+            Assert.ThrowsAsync<SupervisorNotFoundException>(async () => await client.GetHostInfo());
+#else
             var info = await client.GetHostInfo();
 
             Assert.AreEqual("ok", info.Result);
             Assert.IsNotNull(info.Data);
             Assert.IsNotNull(info.Data.OperatingSystem);
+#endif
         }
 
         [Test]
@@ -48,11 +64,15 @@ public async Task ShouldRetrieveCoreInfo()
         {
             var client = ClientFactory.GetClient<InfoClient>();
 
+#if TEST_ENV_HA_CORE
+            Assert.ThrowsAsync<SupervisorNotFoundException>(async () => await client.GetCoreInfo());
+#else
             var info = await client.GetCoreInfo();
 
             Assert.AreEqual("ok", info.Result);
             Assert.IsNotNull(info.Data);
             Assert.IsNotNull(info.Data.Version);
+#endif
         }
     }
 }
diff --git a/HADotNet.Core/BaseClient.cs b/HADotNet.Core/BaseClient.cs
index a9182ef..c84be87 100644
--- a/HADotNet.Core/BaseClient.cs
+++ b/HADotNet.Core/BaseClient.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
+using HADotNet.Core.Domain;
 using Newtonsoft.Json;
 using RestSharp;
 
@@ -55,7 +56,7 @@ protected async Task<T> Get<T>(string path) where T : class
                 return JsonConvert.DeserializeObject<T>(resp.Content);
             }
 
-            throw new Exception($"Unexpected response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
+            throw new HttpResponseException((int)resp.StatusCode, resp.ResponseStatus.ToString(), resp.ResponseUri.PathAndQuery, $"Unexpected GET response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
         }
 
         /// <summary>
@@ -98,7 +99,7 @@ protected async Task<T> Post<T>(string path, object body, bool isRawBody = false
                 return JsonConvert.DeserializeObject<T>(resp.Content);
             }
 
-            throw new Exception($"Unexpected response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
+            throw new HttpResponseException((int)resp.StatusCode, resp.ResponseStatus.ToString(), resp.ResponseUri.PathAndQuery, $"Unexpected POST response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
         }
 
         /// <summary>
@@ -128,7 +129,7 @@ protected async Task<T> Delete<T>(string path) where T : class
                 return JsonConvert.DeserializeObject<T>(resp.Content);
             }
 
-            throw new Exception($"Unexpected response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
+            throw new HttpResponseException((int)resp.StatusCode, resp.ResponseStatus.ToString(), resp.ResponseUri.PathAndQuery, $"Unexpected DELETE response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
         }
 
         /// <summary>
@@ -147,7 +148,7 @@ protected async Task Delete(string path)
 
             if (!(resp.StatusCode == HttpStatusCode.OK || resp.StatusCode == HttpStatusCode.NoContent))
             {
-                throw new Exception($"Unexpected response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
+                throw new HttpResponseException((int)resp.StatusCode, resp.ResponseStatus.ToString(), resp.ResponseUri.PathAndQuery, $"Unexpected DELETE response code {(int)resp.StatusCode} from Home Assistant API endpoint {path}.");
             }
         }
     }
diff --git a/HADotNet.Core/Clients/InfoClient.cs b/HADotNet.Core/Clients/InfoClient.cs
index 1812f18..d274676 100644
--- a/HADotNet.Core/Clients/InfoClient.cs
+++ b/HADotNet.Core/Clients/InfoClient.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using HADotNet.Core.Domain;
 using HADotNet.Core.Models;
 
 namespace HADotNet.Core.Clients
@@ -20,18 +21,48 @@ public InfoClient(Uri instance, string apiKey) : base(instance, apiKey) { }
         /// Retrieves Supervisor information.
         /// </summary>
         /// <returns>A <see cref="SupervisorInfoObject"/> representing Supervisor informatio.</returns>
-        public async Task<ResponseObject<SupervisorInfoObject>> GetSupervisorInfo() => await Get<ResponseObject<SupervisorInfoObject>>("/api/hassio/supervisor/info");
+        public async Task<ResponseObject<SupervisorInfoObject>> GetSupervisorInfo()
+        {
+            try
+            {
+                return await Get<ResponseObject<SupervisorInfoObject>>("/api/hassio/supervisor/info");
+            }
+            catch (HttpResponseException hrex) when (hrex.StatusCode == 404)
+            {
+                throw new SupervisorNotFoundException("This does not appear to be a Home Assistant Supervisor instance. See inner exception for more details.", hrex);
+            }
+        }
 
         /// <summary>
         /// Retrieves Host information.
         /// </summary>
         /// <returns>A <see cref="HostInfoObject"/> representing Host informatio.</returns>
-        public async Task<ResponseObject<HostInfoObject>> GetHostInfo() => await Get<ResponseObject<HostInfoObject>>("/api/hassio/host/info");
+        public async Task<ResponseObject<HostInfoObject>> GetHostInfo()
+        {
+            try
+            {
+                return await Get<ResponseObject<HostInfoObject>>("/api/hassio/host/info");
+            }
+            catch (HttpResponseException hrex) when (hrex.StatusCode == 404)
+            {
+                throw new SupervisorNotFoundException("This does not appear to be a Home Assistant Supervisor instance. See inner exception for more details.", hrex);
+            }
+        }
 
         /// <summary>
         /// Retrieves Core information.
         /// </summary>
         /// <returns>A <see cref="CoreInfoObject"/> representing Host informatio.</returns>
-        public async Task<ResponseObject<CoreInfoObject>> GetCoreInfo() => await Get<ResponseObject<CoreInfoObject>>("/api/hassio/core/info");
+        public async Task<ResponseObject<CoreInfoObject>> GetCoreInfo()
+        {
+            try
+            {
+                return await Get<ResponseObject<CoreInfoObject>>("/api/hassio/core/info");
+            }
+            catch (HttpResponseException hrex) when (hrex.StatusCode == 404)
+            {
+                throw new SupervisorNotFoundException("This does not appear to be a Home Assistant Supervisor instance. See inner exception for more details.", hrex);
+            }
+        }
     }
 }
diff --git a/HADotNet.Core/Domain/HttpResponseException.cs b/HADotNet.Core/Domain/HttpResponseException.cs
new file mode 100644
index 0000000..2811033
--- /dev/null
+++ b/HADotNet.Core/Domain/HttpResponseException.cs
@@ -0,0 +1,63 @@
+using System;
+
+namespace HADotNet.Core.Domain
+{
+    /// <summary>
+    /// Represents a failed HTTP call to a Home Assistant endpoint.
+    /// </summary>
+    public class HttpResponseException : Exception
+    {
+        /// <summary>
+        /// Gets the status code for the HTTP response.
+        /// </summary>
+        public int StatusCode { get; }
+
+        /// <summary>
+        /// Gets the network description, if the error was at the network level.
+        /// </summary>
+        public string NetworkDescription { get; }
+
+        /// <summary>
+        /// Gets the original request path.
+        /// </summary>
+        public string RequestPath { get; }
+
+        /// <summary>
+        /// Gets the error response body.
+        /// </summary>
+        public string ResponseBody { get; }
+
+        /// <summary>
+        /// Initializes a new HttpResponseException.
+        /// </summary>
+        public HttpResponseException(int statusCode, string networkDescription, string requestPath, string responseBody)
+        {
+            StatusCode = statusCode;
+            NetworkDescription = networkDescription;
+            RequestPath = requestPath;
+            ResponseBody = responseBody;
+        }
+
+        /// <summary>
+        /// Initializes a new HttpResponseException.
+        /// </summary>
+        public HttpResponseException(int statusCode, string networkDescription, string requestPath, string responseBody, string message) : base(message)
+        {
+            StatusCode = statusCode;
+            NetworkDescription = networkDescription;
+            RequestPath = requestPath;
+            ResponseBody = responseBody;
+        }
+
+        /// <summary>
+        /// Initializes a new HttpResponseException.
+        /// </summary>
+        public HttpResponseException(int statusCode, string networkDescription, string requestPath, string responseBody, string message, Exception innerException) : base(message, innerException)
+        {
+            StatusCode = statusCode;
+            NetworkDescription = networkDescription;
+            RequestPath = requestPath;
+            ResponseBody = responseBody;
+        }
+    }
+}
diff --git a/HADotNet.Core/Domain/SupervisorNotFoundException.cs b/HADotNet.Core/Domain/SupervisorNotFoundException.cs
new file mode 100644
index 0000000..21c6af6
--- /dev/null
+++ b/HADotNet.Core/Domain/SupervisorNotFoundException.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace HADotNet.Core.Domain
+{
+    /// <summary>
+    /// The exception that occurs when a Supervisor-only API call is made to a non-Supervisor environment.
+    /// </summary>
+    public class SupervisorNotFoundException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the SupervisorNotFoundException.
+        /// </summary>
+        public SupervisorNotFoundException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the SupervisorNotFoundException.
+        /// </summary>
+        public SupervisorNotFoundException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the SupervisorNotFoundException.
+        /// </summary>
+        public SupervisorNotFoundException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}
diff --git a/HADotNet.Core/HADotNet.Core.csproj b/HADotNet.Core/HADotNet.Core.csproj
index 39d97bd..2609c95 100644
--- a/HADotNet.Core/HADotNet.Core.csproj
+++ b/HADotNet.Core/HADotNet.Core.csproj
@@ -12,15 +12,15 @@
     <PackageTags>home-assistant external api library</PackageTags>
     <Title>HADotNet Core Library</Title>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.4.1</Version>
+    <Version>1.5.0</Version>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/qJake/HADotNet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/qJake/HADotNet.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageReleaseNotes></PackageReleaseNotes>
     <LangVersion>7.3</LangVersion>
-    <AssemblyVersion>1.4.1.0</AssemblyVersion>
-    <FileVersion>1.4.1.0</FileVersion>
+    <AssemblyVersion>1.5.0.0</AssemblyVersion>
+    <FileVersion>1.5.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/HADotNet.Core/Models/AddonObject.cs b/HADotNet.Core/Models/AddonObject.cs
index ff89ef4..beb56f6 100644
--- a/HADotNet.Core/Models/AddonObject.cs
+++ b/HADotNet.Core/Models/AddonObject.cs
@@ -14,13 +14,13 @@ public class AddonObject
         public string Description { get; set; }
 
         /// <summary>
-        /// <code>True</code> if icon is available, otherwise <code>False</code>.
+        /// <c>True</c> if icon is available, otherwise <c>False</c>.
         /// </summary>
         [JsonProperty("icon")]
         public bool Icon { get; set; }
 
         /// <summary>
-        /// <code>True</code> if logo is available, otherwise <code>False</code>.
+        /// <c>True</c> if logo is available, otherwise <c>False</c>.
         /// </summary>
         [JsonProperty("logo")]
         public bool Logo { get; set; }
@@ -50,7 +50,7 @@ public class AddonObject
         public string State { get; set; }
 
         /// <summary>
-        /// <code>True</code> if update is available, otherwise <code>False</code>.
+        /// <c>True</c> if update is available, otherwise <c>False</c>.
         /// </summary>
         [JsonProperty("update_available")]
         public bool UpdateAvailable { get; set; }
diff --git a/HADotNet.Core/Models/HostInfoObject.cs b/HADotNet.Core/Models/HostInfoObject.cs
index 1f4d125..648ef00 100644
--- a/HADotNet.Core/Models/HostInfoObject.cs
+++ b/HADotNet.Core/Models/HostInfoObject.cs
@@ -9,43 +9,43 @@ namespace HADotNet.Core.Models
     public class HostInfoObject
     {
         /// <summary>
-        /// Gets or sets the chassis.
+        /// Gets or sets the chassis type.
         /// </summary>
         [JsonProperty("chassis")]
         public string Chassis { get; set; }
 
         /// <summary>
-        /// Gets or sets the CPE.
+        /// Gets or sets the CPE string.
         /// </summary>
         [JsonProperty("cpe")]
         public string Cpe { get; set; }
 
         /// <summary>
-        /// Gets or sets the deployment.
+        /// Gets or sets the deployment type (e.g. production).
         /// </summary>
         [JsonProperty("deployment")]
         public string Deployment { get; set; }
 
         /// <summary>
-        /// Gets or sets the disk free.
+        /// Gets or sets the disk free, expressed in GB.
         /// </summary>
         [JsonProperty("disk_free")]
         public double DiskFree { get; set; }
 
         /// <summary>
-        /// Gets or sets the disk total.
+        /// Gets or sets the disk total, expressed in GB.
         /// </summary>
         [JsonProperty("disk_total")]
         public double DiskTotal { get; set; }
 
         /// <summary>
-        /// Gets or sets the disk used.
+        /// Gets or sets the disk used, expressed in GB.
         /// </summary>
         [JsonProperty("disk_used")]
         public double DiskUsed { get; set; }
 
         /// <summary>
-        /// Gets or sets the features.
+        /// Gets or sets the feature list.
         /// </summary>
         [JsonProperty("features")]
         public IList<string> Features { get; set; }
@@ -57,7 +57,7 @@ public class HostInfoObject
         public string Hostname { get; set; }
 
         /// <summary>
-        /// Gets or sets the kernel.
+        /// Gets or sets the kernel version.
         /// </summary>
         [JsonProperty("kernel")]
         public string Kernel { get; set; }
diff --git a/README.md b/README.md
index 321ab7e..9af1626 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ A simple, straighforward .NET Standard library for the [Home Assistant](https://
 * Logbook API
 * Services API
 * States API
+* Supervisor API (Supervisor-based installations only)
 * Template API
 
 ## Getting Started