Added null check
1 file changed