=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2015-06-18 01:39:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2015-06-19 10:06:15 +0000
@@ -157,9 +157,14 @@
      */
     public Boolean isValidOptionValue( String value )
     {
-        for ( Option option : this.getOptionSet().getOptions() )
-        {
-            if ( option.getCode().equals( value ) )
+        if ( !hasOptionSet() || value == null )
+        {
+            return false;
+        }
+        
+        for ( Option option : getOptionSet().getOptions() )
+        {
+            if ( value.equals( option.getCode() ) )
             {
                 return true;
             }