Fixed error handling / routing