add STOR & add new exception & fix minor issue