Index: src/java/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtil.java
===================================================================
--- src/java/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtil.java	Tue Mar 25 14:59:17 MSK 2008
+++ src/java/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtil.java	Tue Mar 25 14:59:17 MSK 2008
@@ -111,7 +111,7 @@
                                 GrailsDomainClassProperty referencedProp = referencedProperties[k];
                                 if(prop.equals(referencedProp) && prop.isBidirectional())
                             		continue;
-                                if(isCandidateForOtherSide(domainClass, prop, referencedProp)) {
+                                if(!isBasicType(referencedProp) && isCandidateForOtherSide(domainClass, prop, referencedProp)) {
                                     prop.setOtherSide(referencedProp);
                                     break;
                                 }
@@ -128,7 +128,8 @@
 
         if(prop.equals(referencedProp)) return false;
         if(prop.isOneToMany() && referencedProp.isOneToMany() && domainClass.equals(referencedProp.getDomainClass())) return false;
-        boolean isTypeCompatible = referencedProp.getReferencedPropertyType().isAssignableFrom(domainClass.getClazz());
+        boolean isTypeCompatible = referencedProp.getReferencedPropertyType()!=null &&
+                referencedProp.getReferencedPropertyType().isAssignableFrom(domainClass.getClazz());
         Map mappedBy = domainClass.getMappedBy();
 
         Object propertyMapping = mappedBy.get(prop.getName());