Added null check
Oops