Fixed a NullpointerException...