Added #handle_none