Fixed Command Null Issue