got rid of dumb NullPointerException thing