Replace NullPointerException with IllegalArgumentException
Remove the author tag