Null guards and better filtering.