Updated files in src/collections to use new psError functionality. Also cleaned up the code where needed, removing unnecessary error conditions, etc.