Count<T> throws null reference with no rows when upgrading to 2.3.8 #600