diff --git a/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java b/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java
index 05fe053..dbeed46 100644
--- a/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java
+++ b/APED/app/src/main/java/com/example/aped/utils/XMLHandler.java
@@ -84,7 +84,8 @@ public class XMLHandler implements IXML {
                     "//Device[@name='" + deviceName + "']");
             Element result = (Element) xPathExpression.evaluate(
                     root, XPathConstants.NODE);
-            return Integer.parseInt(result.getAttribute("buffer_size"));
+            String bufferSize = result.getAttribute("buffer_size");
+            return Integer.parseInt(bufferSize.equals("") ? "0" : bufferSize);
         } catch (XPathExpressionException e) {
             Log.e(
                     "XMLHandler",
diff --git a/APED/app/src/test/java/com/example/aped/XMLHandlerUnitTest.java b/APED/app/src/test/java/com/example/aped/XMLHandlerUnitTest.java
index 8fbcab0..4c8fcbe 100644
--- a/APED/app/src/test/java/com/example/aped/XMLHandlerUnitTest.java
+++ b/APED/app/src/test/java/com/example/aped/XMLHandlerUnitTest.java
@@ -55,4 +55,11 @@ public class XMLHandlerUnitTest {
             int bufferSize = xmlHandler.getBufferSize("PWM_example");
             assertEquals(1000,bufferSize);
     }
+
+    @Test
+    public void TestInput_NoBufferSize(){
+        XMLHandler xmlHandler = new XMLHandler(xmlFile);
+        int bufferSize = xmlHandler.getBufferSize("example");
+        assertEquals(0,bufferSize);
+    }
 }