DAT-2364 Single function exit point