diff --git a/src/tools/pm_unapply b/src/tools/pm_unapply
index 06d47e6e..e3829ea9 100644
--- a/src/tools/pm_unapply
+++ b/src/tools/pm_unapply
@@ -9,6 +9,7 @@ PM_VAR_DIR="/tmp/patchmanager3"
 PATCH_ROOT_DIR="/usr/share/patchmanager/patches"
 
 # Paths / Files
+PARAMETER="$1"
 PATCH_DIR="$PATCH_ROOT_DIR/$1"
 
 PM_LOG_FILE="$PM_VAR_DIR/patchmanager.log"
@@ -106,30 +107,35 @@ clean_backup_patch() {
 #
 
 if [ ! -f "$PM_LOG_FILE" ]; then
-  log "*** Patch-log created by pm_unapply script $(date) ***"
+  log "*** Patch-log created by pm_unapply script $(date -Iseconds) ***"
 fi
 
 log
 log "----------------------------------"
-log "pm_unapply $(date)"
+log "pm_unapply $(date -Iseconds)"
 log "----------------------------------"
 log
 
-log "$(basename "$PATCH_DIR")"
-
-log "Using patch file: $PATCH_FILE"
+if [ -z "$PARAMETER" ]; then
+  log "ERROR: A parameter must be provided for unapplying!"
+  failure
+fi
 
-if [ -f "$PATCH_FILE" ]; then
-  log "  contains text patch"
+if [ ! -d "$PATCH_DIR" ]; then
+  log "ERROR: $PATCH_DIR is not a directory or does not exist!"
+  failure
 fi
 
+log "$(basename "$PATCH_DIR")"
 log
 
 if [ ! -x "$PATCH_EXEC" ]; then
-  log "ERROR: Cannot find patch executable $PATCH_EXEC"
+  log "ERROR: Cannot use patch executable ${PATCH_EXEC}!"
   failure
 fi
 
+log "Using patch file: $PATCH_FILE"
+
 if [ ! -f "$PATCH_FILE" ]; then
   log "ERROR: Cannot find patch file!"
   failure