diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java
index 9796ca8..c1c6767 100644
--- a/src/com/sheepit/client/Client.java
+++ b/src/com/sheepit/client/Client.java
@@ -283,7 +283,7 @@ public class Client {
 			}
 			
 			// not running but maybe still sending frame
-			while (this.jobsToValidate.size() > 0) {
+			while (this.jobsToValidate.isEmpty() == false) {
 				try {
 					Thread.sleep(2300); // wait a little bit
 				}
@@ -403,7 +403,7 @@ public class Client {
 			String args = "";
 			if (job_to_reset_ != null) {
 				args = "?frame=" + job_to_reset_.getFrameNumber() + "&job=" + job_to_reset_.getId() + "&render_time=" + job_to_reset_.getRenderDuration();
-				if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().length() > 0) {
+				if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().isEmpty() == false) {
 					args += "&extras=" + job_to_reset_.getExtras();
 				}
 			}
diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java
index 054537f..2187132 100644
--- a/src/com/sheepit/client/Server.java
+++ b/src/com/sheepit/client/Server.java
@@ -112,7 +112,7 @@ public class Server extends Thread implements HostnameVerifier, X509TrustManager
 					String args = "";
 					if (this.client != null && this.client.getRenderingJob() != null) {
 						args = "?frame=" + this.client.getRenderingJob().getFrameNumber() + "&job=" + this.client.getRenderingJob().getId();
-						if (this.client.getRenderingJob().getExtras() != null && this.client.getRenderingJob().getExtras().length() > 0) {
+						if (this.client.getRenderingJob().getExtras() != null && this.client.getRenderingJob().getExtras().isEmpty() == false) {
 							args += "&extras=" + this.client.getRenderingJob().getExtras();
 						}
 					}