Added TODO
Check for possible NULL pointers.