nodejs
diff --git a/‎lib/os.js‎
Lines changed: 3 additions & 1 deletion b/‎lib/os.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/node_os.cc‎
Lines changed: 7 additions & 2 deletions b/‎src/node_os.cc‎
Lines changed: 7 additions & 2 deletions
@@ -55,7 +55,7 @@ const {
   getOSInformation: _getOSInformation,
   getTotalMem,
   getUserInfo,
-  getUptime,
+  getUptime: _getUptime,
   isBigEndian,
   setPriority: _setPriority
 } = internalBinding('os');
@@ -80,6 +80,8 @@ const {
 const getHomeDirectory = getCheckedFunction(_getHomeDirectory);
 const getHostname = getCheckedFunction(_getHostname);
 const getInterfaceAddresses = getCheckedFunction(_getInterfaceAddresses);
+const getUptime = getCheckedFunction(_getUptime);
+
 /**
  * @returns {string}
  */
 
@@ -149,10 +149,15 @@ static void GetTotalMemory(const FunctionCallbackInfo<Value>& args) {
 
 
 static void GetUptime(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
   double uptime;
   int err = uv_uptime(&uptime);
-  if (err == 0)
-    args.GetReturnValue().Set(uptime);
+  if (err != 0) {
+    env->CollectUVExceptionInfo(args[args.Length() - 1], err, "uv_uptime");
+    return args.GetReturnValue().SetUndefined();
+  }
+
+  args.GetReturnValue().Set(uptime);
 }