Index: 7.4/trunk/server/Slim/Web/Graphics.pm =================================================================== --- 7.4/trunk/server/Slim/Web/Graphics.pm (revision 28637) +++ 7.4/trunk/server/Slim/Web/Graphics.pm (working copy) @@ -45,7 +45,7 @@ # Allow the client to specify dimensions, etc. $path =~ /music\/(-*\w+)\//; my $trackid = $1; - main::INFOLOG && $log->info("trackid has been parsed from path as: $trackid"); + main::INFOLOG && defined $trackid && $log->info("trackid has been parsed from path as: $trackid"); my $imgName = File::Basename::basename($path); my ($imgBasename, $dirPath, $suffix) = File::Basename::fileparse($path, '\..*'); Index: 7.4/trunk/server/Slim/Control/Queries.pm =================================================================== --- 7.4/trunk/server/Slim/Control/Queries.pm (revision 28637) +++ 7.4/trunk/server/Slim/Control/Queries.pm (working copy) @@ -3638,7 +3638,7 @@ } } else { $request->addResult('alarm_state', $alarmComing); - $request->addResult('alarm_next', $alarmNext + 0); + $request->addResult('alarm_next', defined $alarmNext ? $alarmNext + 0 : 0); } main::DEBUGLOG && $log->debug("statusQuery(): setup base for jive"); Index: 7.4/trunk/server/Slim/Utils/Strings.pm =================================================================== --- 7.4/trunk/server/Slim/Utils/Strings.pm (revision 28637) +++ 7.4/trunk/server/Slim/Utils/Strings.pm (working copy) @@ -376,7 +376,7 @@ } elsif (defined $curString->{$failsafeLang}) { $strings->{$currentLang}->{$name} = $curString->{$failsafeLang}; - main::DEBUGLOG && $log->debug("Language $currentLang using $failsafeLang for $name in $file"); + main::DEBUGLOG && $log->debug("Language $currentLang using $failsafeLang for $name in". defined $file ? $file : 'undefined'); } if ($args->{'storeFailsafe'} && defined $curString->{$failsafeLang}) {