diff --git a/CHANGELOG b/CHANGELOG
index 5ee8a3088..3cdcf5858 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,8 @@ KeePassDroid (0.4)
 KeePassDroid (0.3.4)
   * Add context menus
   * Deal with crash when resuming activity after the process has been killed
-  * Increase clipboard clear time to 60 seconds as a stopgap until I come add a configurable setting.
+  * Increase clipboard clear time as a stopgap until I come add a configurable setting.
+  * Pass upwards potentially more helpful error messages
 
 KeePassDroid (0.3.3)
   * Add new icon and UI enhancements from Francis Jacquerye
diff --git a/src/com/android/keepass/PasswordActivity.java b/src/com/android/keepass/PasswordActivity.java
index e9942f345..737db84ce 100644
--- a/src/com/android/keepass/PasswordActivity.java
+++ b/src/com/android/keepass/PasswordActivity.java
@@ -261,7 +261,7 @@ public class PasswordActivity extends Activity {
 			} catch (FileNotFoundException e) {
 				uiHandler.post(new AfterLoad(R.string.FileNotFound));
 			} catch (IOException e) {
-				uiHandler.post(new AfterLoad("Unknown error."));
+				uiHandler.post(new AfterLoad(e.getMessage()));
 			} catch (InvalidKeyFileException e) {
 				uiHandler.post(new AfterLoad(e.getMessage()));
 			}