diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index 7c40cdcc101..e328369d90c 100644
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -1015,9 +1015,9 @@ FunctionType *FunctionType::get(const Type *ReturnType,
 FunctionType::ParameterAttributes 
 FunctionType::getParamAttrs(unsigned Idx) const {
   if (!ParamAttrs)
-    return ParameterAttributes(0);
-  if (Idx > ParamAttrs->size())
-    return ParameterAttributes(0);
+    return NoAttributeSet;
+  if (Idx >= ParamAttrs->size())
+    return NoAttributeSet;
   return (*ParamAttrs)[Idx];
 }