diff --git a/libburn/trunk/cdrskin/cdrskin.c b/libburn/trunk/cdrskin/cdrskin.c
index f00a2d5c..f9bde34c 100644
--- a/libburn/trunk/cdrskin/cdrskin.c
+++ b/libburn/trunk/cdrskin/cdrskin.c
@@ -3832,9 +3832,13 @@ int Cdrskin_assert_driveno(struct CdrskiN *skin, int flag)
 int Cdrskin_get_device_adr(struct CdrskiN *skin,
            char **device_adr, char **raw_adr, int *no_convert_fs_adr, int flag)
 {
+ int ret;
+
  if(skin->driveno < 0 || (unsigned int) skin->driveno >= skin->n_drives)
    return(0);
- burn_drive_get_adr(&skin->drives[skin->driveno],skin->device_adr);
+ ret= burn_drive_get_adr(&skin->drives[skin->driveno],skin->device_adr);
+ if(ret <= 0)
+   return(0);
  *device_adr= skin->device_adr;
  *raw_adr= skin->preskin->raw_device_adr;
  *no_convert_fs_adr= skin->preskin->no_convert_fs_adr;
diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h
index 21d7dd2a..c1b9712a 100644
--- a/libburn/trunk/cdrskin/cdrskin_timestamp.h
+++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h
@@ -1 +1 @@
-#define Cdrskin_timestamP "2015.10.28.192331"
+#define Cdrskin_timestamP "2015.10.29.082150"