diff --git a/src/filesel.c b/src/filesel.c
index d904f800..a9a9eeb1 100644
--- a/src/filesel.c
+++ b/src/filesel.c
@@ -470,16 +470,21 @@ void bstrtostr( BSTR in, STRPTR out, TEXT max )
 {
   STRPTR iptr;
   dword i;
-
-  iptr = BADDR( in );
-
-  if( max > iptr[0] ) max = iptr[0];
+  dword len;
 
 #if defined(__AROS__)
-  for ( i=0 ; i<max ; i++ ) out[i] = *(AROS_BSTR_ADDR(iptr+i));
+  iptr = AROS_BSTR_ADDR( in );
+  len = AROS_BSTR_strlen( in );
 #else
-  for( i=0; i<max; i++ ) out[i] = iptr[i+1];
+  iptr = BADDR( in );
+  len = iptr[0];
+  iptr++;
 #endif
+
+  if( max > len ) max = len;
+
+  for( i=0; i<max; i++ , iptr++ ) out[i] = *iptr;
+
   out[i] = 0;
 }
 #endif
diff --git a/src/init.c b/src/init.c
index c891e221..4ec36fc1 100644
--- a/src/init.c
+++ b/src/init.c
@@ -664,6 +664,12 @@ T_Gui_skin * Load_graphics(const char * skin_file, T_Gradient_array *gradients)
   char filename[MAX_PATH_CHARACTERS];
   SDL_Surface * gui;
 
+  if (skin_file[0] == '\0')
+  {
+    sprintf(Gui_loading_error_message, "Wrong skin file name \"\"\n");
+    return NULL;
+  }
+
   gfx = (T_Gui_skin *)malloc(sizeof(T_Gui_skin));
   if (gfx == NULL)
   {
@@ -744,6 +750,12 @@ byte * Load_font(const char * font_name)
   char filename[MAX_PATH_CHARACTERS];
   SDL_Surface * image;
 
+  if (font_name[0] == '\0')
+  {
+    sprintf(Gui_loading_error_message, "Wrong font name \"\"\n");
+    return NULL;
+  }
+
   font = (byte *)malloc(8*8*256);
   if (font == NULL)
   {
diff --git a/src/setup.c b/src/setup.c
index 95160b57..257584ac 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -134,7 +134,7 @@ void Set_data_directory(const char * program_dir, char * data_dir)
     strcpy(data_dir, program_dir);
   // All other targets, program is in a "bin" subdirectory
   #elif defined (__AROS__)
-    strcat(data_dir,"/share/grafx2/");
+    strcat(data_dir,"share/grafx2/");
   #else
     strcat(data_dir,"../share/grafx2/");
   #endif