Bug fix: possible null return removed.