Adding 500-th error support