Fix for null check