Added some error checking
refactored package name