Improved notification and fail handling on server-side