Fix NULL frontend