* Protect against null reference
 * CR comments