Minion Fix, null check fixes, command parsing fix

Minion Fix, null check fixes, command parsing fix