case 3128 - Fixed fatal error on nodes fetch.
Merge branch 'case-3128' into develop