diff --git a/supysonic/api/errors.py b/supysonic/api/errors.py
index 818ec39..6d03629 100644
--- a/supysonic/api/errors.py
+++ b/supysonic/api/errors.py
@@ -18,7 +18,7 @@ from .exceptions import GenericError, MissingParameter, NotFound, ServerError
 @api.errorhandler(ValueError)
 def value_error(e):
     rollback()
-    return GenericError(e)
+    return GenericError("{0.__class__.__name__}: {0}".format(e))
 
 @api.errorhandler(BadRequestKeyError)
 def key_error(e):
@@ -33,7 +33,7 @@ def not_found(e):
 @api.errorhandler(500)
 def generic_error(e): # pragma: nocover
     rollback()
-    return ServerError(e)
+    return ServerError("{0.__class__.__name__}: {0}".format(e))
 
 #@api.errorhandler(404)
 @api.route('/<path:invalid>', methods = [ 'GET', 'POST' ]) # blueprint 404 workaround