Removing slug and just use name, improved error handling.