Add error check and modify package name