diff --git a/Zway/Devices/Device.cs b/Zway/Devices/Device.cs
index be64774..b4a57da 100644
--- a/Zway/Devices/Device.cs
+++ b/Zway/Devices/Device.cs
@@ -8,7 +8,7 @@ using LitJson;
 
 namespace BlubbFish.IoT.Zway.Devices {
   public class Device {
-    private Boolean polling;
+    private readonly Boolean polling;
 
     public delegate void UpdatedDevice(Object sender, DeviceUpdateEvent e);
     public event UpdatedDevice Update;
diff --git a/Zway/Interfaces/ACommandClass.cs b/Zway/Interfaces/ACommandClass.cs
index cdabf21..fcb3fe3 100644
--- a/Zway/Interfaces/ACommandClass.cs
+++ b/Zway/Interfaces/ACommandClass.cs
@@ -24,6 +24,7 @@ namespace BlubbFish.IoT.Zway.Interfaces {
       MeterPulse = 53,
       MeterTableMonitor = 61,
       ThermostatOperatingState = 66,
+      ClimateControlSchedule = 70,
       CRC16 = 86,
       AssociationGroupInformation = 89,
       DeviceResetLocally = 90,
diff --git a/Zway/ZwayController.cs b/Zway/ZwayController.cs
index 8d2adc8..96bf6d6 100644
--- a/Zway/ZwayController.cs
+++ b/Zway/ZwayController.cs
@@ -16,7 +16,7 @@ namespace BlubbFish.IoT.Zway {
     private Thread updatethread;
     private Thread pollthread;
     public static ReadOnlyDictionary<String, String> namelist;
-    private Boolean polling;
+    private readonly Boolean polling;
 
     public delegate void DataUpdate(Object sender, DeviceUpdateEvent e);
     public event DataUpdate Update;
diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll
index 6ea1998..4050284 100644
Binary files a/Zway/bin/Release/Zway.dll and b/Zway/bin/Release/Zway.dll differ
diff --git a/Zway/lib/HttpClient.cs b/Zway/lib/HttpClient.cs
index f14becf..0f153b6 100644
--- a/Zway/lib/HttpClient.cs
+++ b/Zway/lib/HttpClient.cs
@@ -6,9 +6,9 @@ using LitJson;
 
 namespace BlubbFish.IoT.Zway.lib {
   public class HttpConnection {
-    private String auth;
-    private String server;
-    private Object getLock = new Object();
+    private readonly String auth;
+    private readonly String server;
+    private readonly Object getLock = new Object();
 
     internal HttpConnection(String server, String user, String pass) {
       this.auth = "Basic " + Convert.ToBase64String(Encoding.ASCII.GetBytes(user + ":" + pass));
@@ -54,9 +54,9 @@ namespace BlubbFish.IoT.Zway.lib {
             }
           }
         } catch (Exception e) {
-          Helper.WriteError("Konnte keine Verbindung zum Razzbery Server herstellen. Resource: \"" + this.server + v + "\" Fehler: " + e.Message);
-          return null;
-          //throw new Exceptions.ConnectionException("Konnte keine Verbindung zum Razzbery Server herstellen: " + e.Message);
+          //Helper.WriteError("Konnte keine Verbindung zum Razzbery Server herstellen. Resource: \"" + this.server + v + "\" Fehler: " + e.Message);
+          //return null;
+          throw new Exceptions.ConnectionException("Konnte keine Verbindung zum Razzbery Server herstellen: " + e.Message);
         }
       }
       return ret;