hmm, probably shouldn't bail on non-deferred commands.