diff --git a/src/mpd_client.c b/src/mpd_client.c
index 58126b0..02bf58d 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -222,15 +222,9 @@ static void mpd_client_api(t_config *config, t_mpd_state *mpd_state, void *arg_r
     float float_buf;
     bool bool_buf, rc;
     char *p_charbuf1, *p_charbuf2, *p_charbuf3, *p_charbuf4;
-    #ifdef DEBUG
-    struct timespec start, end;
-    #endif
 
     LOG_VERBOSE() printf("API request (%ld): %.*s\n", request->conn_id, request->length, request->data);
     
-    #ifdef DEBUG
-    clock_gettime(CLOCK_MONOTONIC_RAW, &start);
-    #endif
     switch(request->cmd_id) {
         case MPD_API_LIKE:
             if (mpd_state->feat_sticker) {
@@ -878,16 +872,6 @@ static void mpd_client_api(t_config *config, t_mpd_state *mpd_state, void *arg_r
             mpd_state->conn_state = MPD_FAILURE;
     }
 
-    #ifdef DEBUG
-    clock_gettime(CLOCK_MONOTONIC_RAW, &end);
-    uint64_t delta_us = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_nsec - start.tv_nsec) / 1000;
-    #ifdef PKGARCH44
-    fprintf(stderr, "DEBUG: Time used: %lu\n", delta_us);
-    #else
-    fprintf(stderr, "DEBUG: Time used: %llu\n", delta_us);
-    #endif
-    #endif
-
     if (len == 0) {
         len = snprintf(buffer, MAX_SIZE, "{\"type\": \"error\", \"data\": \"No response for cmd_id %u.\"}", request->cmd_id);
     }
@@ -1185,7 +1169,7 @@ static void mpd_client_idle(t_config *config, t_mpd_state *mpd_state) {
                 if (mpd_client_queue_length > 0) {
                     //Handle request
                     LOG_DEBUG() fprintf(stderr, "DEBUG: Handle request.\n");
-                    struct work_request_t *request = tiny_queue_shift(mpd_client_queue, 100);
+                    struct work_request_t *request = tiny_queue_shift(mpd_client_queue, 50);
                     if (request != NULL) {
                         mpd_client_api(config, mpd_state, request);
                     }
diff --git a/src/mympd_api.c b/src/mympd_api.c
index ca34e5b..e99796c 100644
--- a/src/mympd_api.c
+++ b/src/mympd_api.c
@@ -100,7 +100,7 @@ void *mympd_api_loop(void *arg_config) {
     }
 
     while (s_signal_received == 0) {
-        struct t_work_request *request = tiny_queue_shift(mympd_api_queue, 0);
+        struct t_work_request *request = tiny_queue_shift(mympd_api_queue, 100);
         if (request != NULL) {
             mympd_api(config, &mympd_state, request);
         }
diff --git a/src/tiny_queue.c b/src/tiny_queue.c
index c6b40b5..b71ea0c 100644
--- a/src/tiny_queue.c
+++ b/src/tiny_queue.c
@@ -19,6 +19,7 @@
 */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <stdbool.h>
 #include <pthread.h>
 #include <asm/errno.h>
@@ -47,8 +48,12 @@ void tiny_queue_free(tiny_queue_t *queue) {
 }
 
 
-void tiny_queue_push(tiny_queue_t *queue, void *data) {
-    pthread_mutex_lock(&queue->mutex);
+int tiny_queue_push(tiny_queue_t *queue, void *data) {
+    int rc = pthread_mutex_lock(&queue->mutex);
+    if (rc != 0) {
+        printf("Error in pthread_mutex_lock: %d\n", rc);
+        return 0;
+    }
     struct tiny_msg_t* new_node = (struct tiny_msg_t*)malloc(sizeof(struct tiny_msg_t));
     new_node->data = data;
     new_node->next = NULL;
@@ -60,53 +65,78 @@ void tiny_queue_push(tiny_queue_t *queue, void *data) {
         queue->tail->next = new_node;
         queue->tail = new_node;
     }
-    pthread_mutex_unlock(&queue->mutex);
-    pthread_cond_signal(&queue->wakeup);
+    rc = pthread_mutex_unlock(&queue->mutex);
+    if (rc != 0) {
+        printf("Error in pthread_mutex_unlock: %d\n", rc);
+        return 0;
+    }
+    rc = pthread_cond_signal(&queue->wakeup);
+    if (rc != 0) {
+        printf("Error in pthread_cond_signal: %d\n", rc);
+        return 0;
+    }
+    return 1;
 }
 
 int tiny_queue_length(tiny_queue_t *queue, int timeout) {
-    pthread_mutex_lock(&queue->mutex);
-    if (timeout > 0) {
+    int rc = pthread_mutex_lock(&queue->mutex);
+    if (rc != 0) {
+        printf("Error in pthread_mutex_lock: %d\n", rc);
+        return 0;
+    }
+    if (timeout > 0 && queue->length == 0) {
         struct timespec max_wait = {0, 0};
         clock_gettime(CLOCK_REALTIME, &max_wait);
         //timeout in ms
         max_wait.tv_nsec += timeout * 1000;
-        while (queue->length == 0) { 
-            // block if queue is empty
-            int rc = pthread_cond_timedwait(&queue->wakeup, &queue->mutex, &max_wait);
-            if (rc == ETIMEDOUT) {
-                break;
-            }
+        rc = pthread_cond_timedwait(&queue->wakeup, &queue->mutex, &max_wait);
+        if (rc != 0) {
+            printf("Error in pthread_cond_timedwait: %d\n", rc);
         }
     }
     unsigned len = queue->length;
-    pthread_mutex_unlock(&queue->mutex);
+    rc = pthread_mutex_unlock(&queue->mutex);
+    if (rc != 0) {
+        printf("Error in pthread_mutex_unlock: %d\n", rc);
+    }
     return len;
 }
 
 void *tiny_queue_shift(tiny_queue_t *queue, int timeout) {
-    pthread_mutex_lock(&queue->mutex);
-    if (timeout > 0) {
-        struct timespec max_wait = {0, 0};
-        clock_gettime(CLOCK_REALTIME, &max_wait);
-        //timeout in ms
-        max_wait.tv_nsec += timeout * 1000;
-        while (queue->head == NULL) { 
-            // block if buffer is empty
-            int rc = pthread_cond_timedwait(&queue->wakeup, &queue->mutex, &max_wait);
-            if (rc == ETIMEDOUT) {
-                pthread_mutex_unlock(&queue->mutex);
+    int rc = pthread_mutex_lock(&queue->mutex);
+    if (rc != 0) {
+        printf("Error in pthread_mutex_lock: %d\n", rc);
+        return 0;
+    }
+    if (queue->length == 0) {
+        if (timeout > 0) {
+            struct timespec max_wait = {0, 0};
+            clock_gettime(CLOCK_REALTIME, &max_wait);
+            //timeout in ms
+            max_wait.tv_nsec += timeout * 1000;
+            rc = pthread_cond_timedwait(&queue->wakeup, &queue->mutex, &max_wait);
+            if (rc != 0) {
+                printf("Error in pthread_cond_timedwait: %d\n", rc);
+                rc = pthread_mutex_unlock(&queue->mutex);
+                if (rc != 0) {
+                    printf("Error in pthread_mutex_unlock: %d\n", rc);
+                }
+                return NULL;
+            }
+        }
+        else {
+            rc = pthread_cond_wait(&queue->wakeup, &queue->mutex);
+            if (rc != 0) {
+                printf("Error in pthread_cond_wait: %d\n", rc);
+                rc = pthread_mutex_unlock(&queue->mutex);
+                if (rc != 0) {
+                    printf("Error in pthread_mutex_unlock: %d\n", rc);
+                }
                 return NULL;
             }
         }
     }
-    else {
-        while (queue->head == NULL) { 
-            // block if buffer is empty
-            pthread_cond_wait(&queue->wakeup, &queue->mutex);
-        }
-    }
-
+    //queue has entry
     struct tiny_msg_t* current_head = queue->head;
     void *data = current_head->data;
     if (queue->head == queue->tail) {
@@ -117,6 +147,9 @@ void *tiny_queue_shift(tiny_queue_t *queue, int timeout) {
     }
     free(current_head);
     queue->length--;
-    pthread_mutex_unlock(&queue->mutex);
+    rc = pthread_mutex_unlock(&queue->mutex);
+    if (rc != 0) {
+        printf("Error in pthread_mutex_unlock: %d\n", rc);
+    }
     return data;
 }
diff --git a/src/tiny_queue.h b/src/tiny_queue.h
index 2ad1d36..34d55d7 100644
--- a/src/tiny_queue.h
+++ b/src/tiny_queue.h
@@ -35,7 +35,7 @@ typedef struct tiny_queue_t {
 
 tiny_queue_t *tiny_queue_create(void);
 void tiny_queue_free(tiny_queue_t *queue);
-void tiny_queue_push(struct tiny_queue_t *queue, void *data);
+int tiny_queue_push(struct tiny_queue_t *queue, void *data);
 void *tiny_queue_shift(struct tiny_queue_t *queue, int timeout);
 int tiny_queue_length(struct tiny_queue_t *queue, int timeout);
 #endif