Removed NullPointerException tags