Split dual error catching in Database.java that prevented the class to be compiled.