Fixed bad default settings an a NullPointerException