Fix command exception