Fixed nullPointerException thrown when AttributeDescriptor is null
Added test case for fix
Merge pull request #647 from tbarsballe/mergefix

Fixed nullPointerException thrown when AttributeDescriptor is null