Better handling for null types