diff --git a/commentHandler.go b/commentHandler.go
index 239bd3e..a68a852 100644
--- a/commentHandler.go
+++ b/commentHandler.go
@@ -55,10 +55,11 @@ func handleComment(req types.IssueCommentOuter) {
 
 		if allowed {
 			client, ctx := makeClient()
-			_, _, err := client.Issues.AddLabelsToIssue(ctx, req.Repository.Owner.Login, req.Repository.Name, req.Issue.Number, []string{command.Value})
+			_, res, err := client.Issues.AddLabelsToIssue(ctx, req.Repository.Owner.Login, req.Repository.Name, req.Issue.Number, []string{command.Value})
 			if err != nil {
-				log.Fatalln(err)
+				log.Fatalf("%s, limit: %d, remaining: %d", err, res.Limit, res.Remaining)
 			}
+
 			fmt.Println("Label added successfully or already existed.")
 		}
 		break
diff --git a/main.go b/main.go
index 64fa44c..7a6596c 100644
--- a/main.go
+++ b/main.go
@@ -47,6 +47,6 @@ func main() {
 		handleComment(req)
 		break
 	default:
-		log.Fatalln("X_Github_Event want: ['pull_request', 'comment'], got: " + eventType)
+		log.Fatalln("X_Github_Event want: ['pull_request', 'issue_comment'], got: " + eventType)
 	}
 }
diff --git a/handler.go b/pullRequestHandler.go
similarity index 84%
rename from handler.go
rename to pullRequestHandler.go
index f0a2f1c..6414712 100644
--- a/handler.go
+++ b/pullRequestHandler.go
@@ -44,9 +44,9 @@ func handlePullRequest(req types.PullRequestOuter) {
 
 		if hasNoDcoLabel(issue) == false {
 			fmt.Println("Applying label")
-			_, _, assignLabelErr := client.Issues.AddLabelsToIssue(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number, []string{"no-dco"})
+			_, res, assignLabelErr := client.Issues.AddLabelsToIssue(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number, []string{"no-dco"})
 			if assignLabelErr != nil {
-				log.Fatal(assignLabelErr)
+				log.Fatalf("%s limit: %d, remaining: %d", assignLabelErr, res.Limit, res.Remaining)
 			}
 
 			link := fmt.Sprintf("https://github.com/%s/%s/blob/master/CONTRIBUTING.md", req.Repository.Owner.Login, req.Repository.Name)
@@ -59,16 +59,18 @@ That's something we need before your Pull Request can be merged. Please see our
 
 			comment, resp, err := client.Issues.CreateComment(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number, comment)
 			if err != nil {
+				log.Fatalf("%s limit: %d, remaining: %d", assignLabelErr, resp.Limit, resp.Remaining)
 				log.Fatal(err)
 			}
 			fmt.Println(comment, resp.Rate)
 		}
 	} else {
 		fmt.Println("Things look OK right now.")
-		issue, _, labelErr := client.Issues.Get(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number)
+		issue, res, labelErr := client.Issues.Get(ctx, req.Repository.Owner.Login, req.Repository.Name, req.PullRequest.Number)
 
 		if labelErr != nil {
-			log.Fatalln(labelErr)
+			log.Fatalf("%s limit: %d, remaining: %d", labelErr, res.Limit, res.Remaining)
+			log.Fatalln()
 		}
 
 		if hasNoDcoLabel(issue) {