diff --git a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
index ef45079..0414951 100644
--- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
@@ -211,14 +211,15 @@ public class QueryRestController {
     * 
     * @param query the {@link ChannelStatusQuery}
     * @param res the {@link HttpServletResponse} instance associated with this request
-    * @throws IOException thrown if writing to the output stream fails
+    * @return Collection of channel status info
+    * @throws Throwable in case something goes wrong
     */
    @RequestMapping(
          value = PATH_STATUS_CHANNELS,
          method = RequestMethod.POST,
          consumes = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody Collection<ChannelStatus> executeChannelStatusQuery(@RequestBody ChannelStatusQuery query,
-         HttpServletResponse res) throws Exception {
+         HttpServletResponse res) throws Throwable {
 
       // set backends if not defined yet
       channelNameCache.setBackends(query.getChannels());
@@ -268,7 +269,7 @@ public class QueryRestController {
     * 
     * @param query the {@link DAQQuery}
     * @param res the {@link HttpServletResponse} instance associated with this request
-    * @throws IOException thrown if writing to the output stream fails
+    * @throws Exception thrown if writing to the output stream fails
     */
    @RequestMapping(
          value = PATH_QUERY,
@@ -299,13 +300,13 @@ public class QueryRestController {
     * Catch-all query method for getting data from the backend for both JSON and CSV requests.
     * <p>
     * The {@link DAQQueries} object will contain the concrete subclass based on the combination of
-    * fields defined in the user's query. The {@link AttributeBasedDeserializer} decides which class
+    * fields defined in the user's query. The AttributeBasedDeserializer decides which class
     * to deserialize the information into and has been configured (see
     * QueryRestConfig#afterPropertiesSet) accordingly.
     * 
-    * @param queries the {@link DAQQueryElement}s
+    * @param queries the {@link DAQQueries}
     * @param res the {@link HttpServletResponse} instance associated with this request
-    * @throws IOException thrown if writing to the output stream fails
+    * @throws Exception thrown if writing to the output stream fails
     */
    @RequestMapping(
          value = PATH_QUERIES,