Add credentials error message, cleaned up request and specs