Fixed the 500 when client reached the limit.

Fixed the 500 when client reached the limit. #610