Fixed a NullPointerError