Fixed issue with null property