Properly check for null equality
Make parameters final