Fix for null case