diff --git a/lib/serverlist.dart b/lib/serverlist.dart
index 64d289e..379455f 100644
--- a/lib/serverlist.dart
+++ b/lib/serverlist.dart
@@ -155,38 +155,41 @@ class _ServerListState extends State<ServerList> {
       builder: (BuildContext context) {
         return AlertDialog(
           title: Text('Adding a server'),
-          content: SingleChildScrollView(child: Form(
-            key: _formKey,
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
-                TextFormField(
-                  controller: uri,
-                ),
-                TextFormField(
-                  decoration: InputDecoration(
-                      labelText: 'Custom Name', hintText: 'Optional'),
-                  controller: servername,
-                ),
-                Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: RaisedButton(
-                    child: Text("Add"),
-                    onPressed: () {
-                      if (_formKey.currentState.validate()&&uri.text.isNotEmpty) {
-                        _formKey.currentState.save();
-                        Server server = Server(uri.text, uri.text);
-                        servers.add(server);
-                        _updateServerStatus(server);
-                        Navigator.of(context).pop();
-                      }
-                    },
+          content: SingleChildScrollView(
+            child: Form(
+              key: _formKey,
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  TextFormField(
+                    controller: uri,
                   ),
-                )
-              ],
+                  TextFormField(
+                    decoration: InputDecoration(
+                        labelText: 'Custom Name', hintText: 'Optional'),
+                    controller: servername,
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: RaisedButton(
+                      child: Text("Add"),
+                      onPressed: () {
+                        if (_formKey.currentState.validate() &&
+                            uri.text.isNotEmpty) {
+                          _formKey.currentState.save();
+                          Server server = Server(uri.text, uri.text);
+                          servers.add(server);
+                          _updateServerStatus(server);
+                          Navigator.of(context).pop();
+                        }
+                      },
+                    ),
+                  )
+                ],
+              ),
             ),
           ),
-        ),);
+        );
       },
     );
   }
@@ -220,7 +223,10 @@ class _ServerListState extends State<ServerList> {
               decoration: BoxDecoration(
                   border: Border(top: BorderSide(color: Colors.grey))),
             ),
-            Text(servers[index].uri,textAlign: TextAlign.left,),
+            Text(
+              servers[index].uri,
+              textAlign: TextAlign.left,
+            ),
           ],
         );
       }
@@ -375,17 +381,11 @@ class _ServerListState extends State<ServerList> {
     var location = uri.path;
 
     for (int i = 0; i < 5; i++) {
-      Response response;
-      try {
-         response = await HttpUtils.getForFullResponse(
-            scheme + "://" + host,
-            headers: <String, String>{"Location": location})
-            .timeout(new Duration(seconds: 3));
-      } catch (error){
-        if (error == TimeoutException)
-          return ServerStatus.timeout;
-        throw error;
-      }
+      Response response = await HttpUtils.getForFullResponse(
+              scheme + "://" + host,
+              headers: <String, String>{"Location": location})
+          .timeout(new Duration(seconds: 3));
+
       if (response.statusCode > 199 && response.statusCode < 300) {
         return ServerStatus.ok;
       } else if (response.statusCode == HttpStatus.movedPermanently ||