Fix NULL deference