Added: Fix for null pointer issue