API V2 - Error handling refactored