Correct command event troubles

Handling nulls