Added check for null values for availability elements