Add error message and dependency fixes