Null in models fix