Fixed some exceptions in the Adapters