diff --git a/lib/msf/core/exploit/afp.rb b/lib/msf/core/exploit/afp.rb
index e52b2de7fe..f2a855601e 100644
--- a/lib/msf/core/exploit/afp.rb
+++ b/lib/msf/core/exploit/afp.rb
@@ -234,7 +234,12 @@ module Exploit::Remote::AFP
 		network_addresses = read_array(body, network_addresses_offset, true)
 		parsed_data[:network_addresses] = parse_network_addresses(network_addresses)
 		# skiped directory names
-		parsed_data[:utf8_server_name] = read_utf8_pascal_string(body, utf8_servername_offset)
+		#Error catching for offset issues on this field. Need better error ahndling all through here
+		begin
+		  parsed_data[:utf8_server_name] = read_utf8_pascal_string(body, utf8_servername_offset)
+		rescue
+		  parsed_data[:utf8_server_name] = "N/A"
+	  end
 
 		return parsed_data
 	end