Fixing double standard with nil handling.