Simply DatabaseError
Cleanup for consistency
Fix whitespace