4 files changed, 16 insertions, 14 deletions
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
index ae7199fcc..86a2171fa 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java
@@ -1,5 +1,7 @@
 package de.danoeh.antennapod.gpoddernet.model;
 
+import org.apache.commons.lang3.Validate;
+
 public class GpodnetDevice {
 
     private String id;
@@ -9,9 +11,7 @@ public class GpodnetDevice {
 
     public GpodnetDevice(String id, String caption, String type,
                          int subscriptions) {
-        if (id == null) {
-            throw new IllegalArgumentException("ID must not be null");
-        }
+        Validate.notNull(id);
 
         this.id = id;
         this.caption = caption;
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
index aa01b66e2..b002035c9 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java
@@ -1,5 +1,7 @@
 package de.danoeh.antennapod.gpoddernet.model;
 
+import org.apache.commons.lang3.Validate;
+
 public class GpodnetPodcast {
     private String url;
     private String title;
@@ -11,10 +13,9 @@ public class GpodnetPodcast {
 
     public GpodnetPodcast(String url, String title, String description,
                           int subscribers, String logoUrl, String website, String mygpoLink) {
-        if (url == null || title == null || description == null) {
-            throw new IllegalArgumentException(
-                    "URL, title and description must not be null");
-        }
+        Validate.notNull(url);
+        Validate.notNull(title);
+        Validate.notNull(description);
 
         this.url = url;
         this.title = title;
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
index dccb53e5d..a4617118d 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java
@@ -1,5 +1,7 @@
 package de.danoeh.antennapod.gpoddernet.model;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.List;
 
 public class GpodnetSubscriptionChange {
@@ -9,10 +11,9 @@ public class GpodnetSubscriptionChange {
 
     public GpodnetSubscriptionChange(List<String> added, List<String> removed,
                                      long timestamp) {
-        if (added == null || removed == null) {
-            throw new IllegalArgumentException(
-                    "added and remove must not be null");
-        }
+        Validate.notNull(added);
+        Validate.notNull(removed);
+
         this.added = added;
         this.removed = removed;
         this.timestamp = timestamp;
diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
index e8a36a554..80b84095e 100644
--- a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
+++ b/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java
@@ -1,5 +1,7 @@
 package de.danoeh.antennapod.gpoddernet.model;
 
+import org.apache.commons.lang3.Validate;
+
 import java.util.Comparator;
 
 public class GpodnetTag {
@@ -8,9 +10,7 @@ public class GpodnetTag {
     private int usage;
 
     public GpodnetTag(String name, int usage) {
-        if (name == null) {
-            throw new IllegalArgumentException("Name must not be null");
-        }
+        Validate.notNull(name);
 
         this.name = name;
         this.usage = usage;