added handler for null values