Add better error feedback on command exception