diff --git a/DESCRIPTION b/DESCRIPTION
index fc4405427e8452779fe5c343558bfad7c7379473..88bbd9edec2d9c76c53f0ac72709957df8552843 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: SWATdoctR
 Type: Package
 Title: Finding the right diagnoses and treatments for SWAT+ models
-Version: 0.1.5
+Version: 0.1.6
 Author: c(person("Svajunas", "Plunge",
              email = "svajunas_plunge@sggw.edu.pl",
              role = c("aut")),
diff --git a/R/run_swat_verify.R b/R/run_swat_verify.R
index 9b30a32b6b3d3f18338aeed8f82b4b6afba7c1db..a2bdfd3aa6993429c1d9965a32fa0f73632952e2 100644
--- a/R/run_swat_verify.R
+++ b/R/run_swat_verify.R
@@ -61,11 +61,11 @@ run_swat_verification <- function(project_path, outputs = c('wb', 'mgt', 'plt'),
   msg <- run(run_os(swat_exe, os), wd = run_path,
              error_on_status = FALSE)
 
-  if(msg$timeout) {
+  if(nchar(msg$stderr) > 0) {
     out_msg <- str_split(msg$stdout, '\r\n|\r|\n', simplify = TRUE) %>%
       .[max(1, length(.) - 10):length(.)]
-    err_msg <- c(paste0('Simulation timed out after ', time_out, ' sec'),
-                 'Simulation run:', out_msg)
+    err_msg <- str_split(msg$stderr, '\r\n|\r|\n', simplify = TRUE)
+    err_msg <- c('Last output:', out_msg, 'Error:', err_msg)
     model_output <- err_msg
   } else if(nchar(msg$stderr) == 0) {
     model_output <- list()