Correct loading order, data loading and null values check