diff --git a/moonlight-common/src/com/limelight/nvstream/http/NvApp.java b/moonlight-common/src/com/limelight/nvstream/http/NvApp.java
index c5ef9952..f7353878 100644
--- a/moonlight-common/src/com/limelight/nvstream/http/NvApp.java
+++ b/moonlight-common/src/com/limelight/nvstream/http/NvApp.java
@@ -1,5 +1,7 @@
 package com.limelight.nvstream.http;
 
+import com.limelight.LimeLog;
+
 public class NvApp {
 	private String appName = "";
 	private int appId;
@@ -11,8 +13,12 @@ public class NvApp {
 	}
 	
 	public void setAppId(String appId) {
-		this.appId = Integer.parseInt(appId);
-		this.initialized = true;
+		try {
+			this.appId = Integer.parseInt(appId);
+			this.initialized = true;
+		} catch (NumberFormatException e) {
+			LimeLog.warning("Malformed app ID: "+appId);
+		}
 	}
 	
 	public void setIsRunning(String isRunning) {
diff --git a/moonlight-common/src/com/limelight/nvstream/wol/WakeOnLanSender.java b/moonlight-common/src/com/limelight/nvstream/wol/WakeOnLanSender.java
index 312bfc4f..e2367720 100644
--- a/moonlight-common/src/com/limelight/nvstream/wol/WakeOnLanSender.java
+++ b/moonlight-common/src/com/limelight/nvstream/wol/WakeOnLanSender.java
@@ -6,6 +6,7 @@ import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.util.Scanner;
 
+import com.limelight.LimeLog;
 import com.limelight.nvstream.http.ComputerDetails;
 
 public class WakeOnLanSender {
@@ -45,7 +46,12 @@ public class WakeOnLanSender {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(macAddress).useDelimiter(":");
 		for (int i = 0; i < macBytes.length && scan.hasNext(); i++) {
-			macBytes[i] = (byte) Integer.parseInt(scan.next(), 16);
+			try {
+				macBytes[i] = (byte) Integer.parseInt(scan.next(), 16);
+			} catch (NumberFormatException e) {
+				LimeLog.warning("Malformed MAC address: "+macAddress+" (index: "+i+")");
+				break;
+			}
 		}
 		scan.close();
 		return macBytes;