Added Index to Device ENtity + Exception handling if Index is missing