Fix issues regarding failed evaluation commands