fix(commerce): Added proper error handling;