diff --git a/main.go b/main.go
index 3c1d6d0..d674442 100644
--- a/main.go
+++ b/main.go
@@ -71,10 +71,10 @@ func main() {
 
 	server := &http.Server{
 		Addr:              ":8000",
-		ReadTimeout:       5 * time.Second,
-		WriteTimeout:      5 * time.Second,
+		ReadTimeout:       30 * time.Second,
+		WriteTimeout:      30 * time.Second,
 		IdleTimeout:       30 * time.Second,
-		ReadHeaderTimeout: 3 * time.Second,
+		ReadHeaderTimeout: 30 * time.Second,
 	}
 
 	if config.Server.cert != "" && config.Server.key != "" {
diff --git a/proxy.go b/proxy.go
index 25ac4e5..83ef34d 100644
--- a/proxy.go
+++ b/proxy.go
@@ -56,7 +56,7 @@ const (
 // NewProxy creates a new S3Proxy. This implements the ServerHTTP interface.
 func NewProxy(s3conf S3Config, auth Authenticator, messenger Messenger, database *common.SDAdb, tls *tls.Config) *Proxy {
 	tr := &http.Transport{TLSClientConfig: tls}
-	client := &http.Client{Transport: tr}
+	client := &http.Client{Transport: tr, Timeout: 30 * time.Second}
 
 	return &Proxy{s3conf, auth, messenger, database, client, make(map[string]string)}
 }
@@ -122,8 +122,7 @@ func (p *Proxy) allowedResponse(w http.ResponseWriter, r *http.Request) {
 	s3response, err := p.forwardToBackend(r)
 
 	if err != nil {
-		log.Debug("internal server error")
-		log.Debug(err)
+		log.Debugf("forwarding error: %v", err)
 		p.internalServerError(w, r)
 
 		return