Added erroraction where required