Add extra checks for null items