diff --git a/src/com/limelight/PcView.java b/src/com/limelight/PcView.java
index c75564fd..660c22d7 100644
--- a/src/com/limelight/PcView.java
+++ b/src/com/limelight/PcView.java
@@ -322,6 +322,11 @@ public class PcView extends Activity {
 			return;
 		}
 		
+		if (computer.macAddress == null) {
+			Toast.makeText(PcView.this, "Unable to wake PC because GFE didn't send a MAC address", Toast.LENGTH_SHORT).show();
+			return;
+		}
+		
 		Toast.makeText(PcView.this, "Waking PC...", Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
 			@Override