Fix Issue 135: NPE while mapping to a nested property