diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
index 992dca2b3..0e4cbdb47 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -145,21 +145,13 @@ public class EurekaClientAutoConfiguration {
 
 		String serverContextPath = env.getProperty("server.servlet.context-path", "/");
 		int serverPort = Integer
-				.valueOf(env.getProperty("server.port", env.getProperty("port", "8080")));
+				.parseInt(env.getProperty("server.port", env.getProperty("port", "8080")));
 
-		Integer managementPort = env.getProperty("management.server.port", Integer.class); // nullable.
-		// should
-		// be
-		// wrapped
-		// into
-		// optional
+		Integer managementPort = env.getProperty("management.server.port", Integer.class);
 		String managementContextPath = env
-				.getProperty("management.server.servlet.context-path"); // nullable.
-																		// should
-		// be wrapped into
-		// optional
+				.getProperty("management.server.servlet.context-path");
 		Integer jmxPort = env.getProperty("com.sun.management.jmxremote.port",
-				Integer.class); // nullable
+				Integer.class);
 		EurekaInstanceConfigBean instance = new EurekaInstanceConfigBean(inetUtils);
 
 		instance.setNonSecurePort(serverPort);