Fix for ACT-1837: CommandContext Logs and Re-throws Exceptions (Regression)