Minor changes. Exception when adapter not available.