fixed some issues with one() throwing NoResultFound exceptions