Added new error messages, bug fix for pivotal tracker bug id: 70461042