Fixes RefNULL 8/14