Fixed a NullPointerException bug in the just created check :$