Start of better handling of client errors, let client enter IP