Fix for null check.