diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java
index baea44abd4e..9bd030956d0 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java
@@ -23,18 +23,23 @@ public class JetConstantExpression extends JetExpression {
         String nodeText = getNode().getText();
 
         if (elementType == JetNodeTypes.INTEGER_CONSTANT) {
-            if (nodeText.startsWith("0x") || nodeText.startsWith("0X")) {
-                String hexString = nodeText.substring(2);
-                long longValue = Long.parseLong(hexString, 16);
-                if (Integer.MIN_VALUE <= longValue && longValue <= Integer.MAX_VALUE) {
-                    return (int) longValue;
+            try {
+                if (nodeText.startsWith("0x") || nodeText.startsWith("0X")) {
+                    String hexString = nodeText.substring(2);
+                    int length = hexString.length();
+                    if (length > 8) {
+                        return Long.parseLong(hexString);
+                    }
+                    return getRangedValue(Long.parseLong(hexString, 16));
                 }
-                return longValue;
+                if (nodeText.startsWith("0b") || nodeText.startsWith("0B")) {
+                    return getRangedValue(Long.parseLong(nodeText.substring(2), 2));
+                }
+                return getRangedValue(Long.parseLong(nodeText));
             }
-            if (nodeText.startsWith("0b") || nodeText.startsWith("0B")) {
-                return Integer.parseInt(nodeText.substring(2), 2);
+            catch (NumberFormatException e) {
+                return null;
             }
-            return Integer.parseInt(nodeText);
         }
         else if (elementType == JetNodeTypes.LONG_CONSTANT) {
             if (nodeText.endsWith("l") || nodeText.endsWith("L")) {
@@ -73,4 +78,17 @@ public class JetConstantExpression extends JetExpression {
             throw new IllegalArgumentException("Unsupported constant: " + this);
         }
     }
+
+    private Object getRangedValue(long longValue) {
+        if (Byte.MIN_VALUE <= longValue && longValue <= Byte.MAX_VALUE) {
+                    return (byte) longValue;
+                }
+        if (Short.MIN_VALUE <= longValue && longValue <= Short.MAX_VALUE) {
+                    return (short) longValue;
+                }
+        if (Integer.MIN_VALUE <= longValue && longValue <= Integer.MAX_VALUE) {
+                    return (int) longValue;
+                }
+        return longValue;
+    }
 }
diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
index 0c432266a1e..84d02c1046c 100644
--- a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
@@ -502,7 +502,11 @@ public class JetTypeInferrer {
             IElementType elementType = expression.getNode().getElementType();
             JetStandardLibrary standardLibrary = semanticServices.getStandardLibrary();
             if (elementType == JetNodeTypes.INTEGER_CONSTANT) {
-                if (expression.getValue() instanceof Long) {
+                Object value = expression.getValue();
+                if (value == null) {
+                    semanticServices.getErrorHandler().genericError(expression.getNode(), "Number is of range for Long");
+                }
+                else if (value instanceof Long) {
                     result = standardLibrary.getLongType();
                 }
                 else {