Yep, null checks added.