Adding eager null checks to all remaining modules.