Layout changes and added exception for null database

Signed-off-by: unknown <potlurim@686RYR1.AAUW.org>