Thanks. I created a Jira issue: https://nhibernate.jira.com/browse/NH-3087
I also forked on github though I'm certain this will be a non-trivial issue for someone new to the NHibernate source! I'm not able to work out how to assign the issue to me... probably not important right now.
