[PLAT-6005] Throw more useful exceptions (Tim)
[PLAT-5998] Correcting package name (Kostas)