diff --git a/lib/Travelynx/Command/traewelling.pm b/lib/Travelynx/Command/traewelling.pm
index 772c63cfdb0b29fe981f4873ac1b4e76690e8a7b..52222f061a80628f2e4746efd8ddfcc99193541b 100644
--- a/lib/Travelynx/Command/traewelling.pm
+++ b/lib/Travelynx/Command/traewelling.pm
@@ -21,6 +21,8 @@ sub pull_sync {
 	for my $account_data ( $self->app->traewelling->get_pull_accounts ) {
 
 		if ( -e 'maintenance' ) {
+			$self->app->log->debug(
+				'treawelling: "maintenance" file found, aborting');
 			return;
 		}
 
@@ -90,6 +92,8 @@ sub push_sync {
 	for my $candidate ( $self->app->traewelling->get_pushable_accounts ) {
 
 		if ( -e 'maintenance' ) {
+			$self->app->log->debug(
+				'treawelling: "maintenance" file found, aborting');
 			return;
 		}
 
@@ -137,6 +141,12 @@ sub run {
 	my $push_result;
 	my $pull_result;
 
+	if ( -e 'maintenance' ) {
+		$self->app->log->debug(
+			'treawelling: "maintenance" file found, aborting');
+		return;
+	}
+
 	if ( not $direction or $direction eq 'push' ) {
 		$push_result = $self->push_sync;
 	}
@@ -150,6 +160,8 @@ sub run {
 	my $trwl_pull_finished_at = DateTime->now( time_zone => 'Europe/Berlin' );
 
 	if ( -e 'maintenance' ) {
+		$self->app->log->debug(
+			'treawelling: "maintenance" file found, aborting');
 		return;
 	}
 
diff --git a/lib/Travelynx/Command/work.pm b/lib/Travelynx/Command/work.pm
index b80b0a4f01cccc64e6fdcca5893a5ce66b08dd96..65fddc35345395d3fb4e1172bb8add781ab18273 100644
--- a/lib/Travelynx/Command/work.pm
+++ b/lib/Travelynx/Command/work.pm
@@ -22,7 +22,7 @@ sub run {
 	my $json             = JSON->new;
 
 	if ( -e 'maintenance' ) {
-		$self->app->log->debug('maintenance mode, quitting ');
+		$self->app->log->debug('work: "maintenance" file found, aborting');
 		return;
 	}
 
@@ -38,7 +38,7 @@ sub run {
 	for my $entry ( $self->app->in_transit->get_all_active ) {
 
 		if ( -e 'maintenance' ) {
-			$self->app->log->debug('maintenance mode, quitting ');
+			$self->app->log->debug('work: "maintenance" file found, aborting');
 			return;
 		}