Fixes RefNULL 7/14