Replace NullPointerException with ArgumentError - makes more sense