Added checks for possible null components