Added proper where to find.
Null-safe checks for remove.