diff --git a/js/main-unminified.js b/js/main-unminified.js
index d7875d5d0..581e160e3 100644
--- a/js/main-unminified.js
+++ b/js/main-unminified.js
@@ -118063,7 +118063,13 @@
                                                                 unsafeResult.constructor.name
                                                                     ? new BigNumber(safeResult)
                                                                     : safeResult;
-                                                        callback(void 0, finalResult);
+                                                                    
+                                                        // "0x" is an bad result, a real result 'uint = 0' would have padded zeros 0x0000... 
+                                                        if (functionName === 'decimals' && result === '0x') {
+                                                            callback("No decimals property at address", undefined);
+                                                        } else {
+                                                            callback(void 0, finalResult);
+                                                        }
                                                     } catch (errJson) {
                                                         retries > 0
                                                             ? setTimeout(function() {
@@ -118109,7 +118115,13 @@
                                                                     unsafeResult.constructor.name
                                                                     ? new BigNumber(safeResult)
                                                                     : safeResult;
-                                                        callback(void 0, finalResult);
+                                                        
+                                                        // "0x" is an bad result, a real result 'uint = 0' would have padded zeros 0x0000... 
+                                                        if (functionName === 'decimals' && result === '0x') {
+                                                            callback("No decimals property at address", undefined);
+                                                        } else {
+                                                            callback(void 0, finalResult);
+                                                        }            
                                                     } catch (errJson) {
                                                         proxy(1);
                                                     }
@@ -128731,7 +128743,7 @@
                                                         'decimals',
                                                         [],
                                                         function(err, result) {
-                                                            !err && result > 0
+                                                            !err && result && result.greaterThanOrEqualTo(0)
                                                                 ? ((token.decimals = result.toNumber()),
                                                                   self.utility.call(
                                                                       self.web3,