diff --git a/src/TableRow.jsx b/src/TableRow.jsx
index b35b6c2c7..aab41e448 100644
--- a/src/TableRow.jsx
+++ b/src/TableRow.jsx
@@ -55,9 +55,17 @@ const TableRow = React.createClass({
       }
 
       if (render) {
-        text = render(text, record, index) || {};
+        text = render(text, record, index);
+        if (text == null) {
+          text = {}
+        }
+
         tdProps = text.props || {};
 
+        if (typeof text === 'number' || typeof text === 'boolean') {
+          text = String(text)
+        }
+
         if (typeof text !== 'string' && !React.isValidElement(text) && 'children' in text) {
           text = text.children;
         }