Added JavaDoc and database exceptions