added null cast check