Silenced some commands, better error recovery