Develop

Changes for TLT 499: Display appropriate custom message to user on error