Merge "libdatasource: fix null dereference"