Error handling fix
package.json fix