Added None handling functions