PSW-15 Fixed Lib error causing crashes during checkout