Added device properties and some exception handling