Added checks for valid properties before registering the datasource.