Removed Client and secret keys

Also added exceptions