Fixed two "null case" bugs: