Prepare for next development cycle.

Moved loop in findAll to avoid a possible null pointer exception.