diff --git a/lib/prey/providers/system/platform/mac/index.js b/lib/prey/providers/system/platform/mac/index.js
index <HASH>..<HASH> 100644
--- a/lib/prey/providers/system/platform/mac/index.js
+++ b/lib/prey/providers/system/platform/mac/index.js
@@ -8,6 +8,8 @@ exports.get_os_version = function(callback){
 	callback('lion');
 }
 
+// when battery is charging, time remaining is actually
+// what remains until the battery is full.
 exports.get_battery_info = function(callback){
 		
 	var cmd = 'pmset -g batt';
@@ -19,7 +21,8 @@ exports.get_battery_info = function(callback){
 
 		var percentage_remaining = output.match(/(\d+)%;/)[1];
 		var state = output.match(/%;\s+(\w+)/)[1];
-		var time_remaining = output.match(/;\s+(\d+:\d+)/)[1];
+		if(time_value = output.match(/;\s+(\d+:\d+)/))
+			var time_remaining = time_value[1];
 
 		var data = {
 			percentage_remaining: percentage_remaining,
Fix battery info on Mac when no time remaining is given