Feature/unifying exceptions handling failures

consolidating failure cases.