Added null-checker