diff --git a/98_TadoAPI.pm b/98_TadoAPI.pm
index b1a780f..af4f319 100644
--- a/98_TadoAPI.pm
+++ b/98_TadoAPI.pm
@@ -29,6 +29,7 @@ use HTTP::Request::Common qw (POST GET PUT);
 use HTTP::Headers;
 use JSON;
 use POSIX qw(strftime);
+use Carp;
 
 ####DEFAULTS############
 my $client_id     = 'public-api-preview';
@@ -468,7 +469,7 @@ sub TadoAPI_LoadToken {
     if ($apiStatus) {
         my $TOKENFILE;
         eval{
-        open( $TOKENFILE, q{<}, $tokenFileName ) or die("ERROR: $!");
+        open( $TOKENFILE, q{<}, $tokenFileName ) or croak( "Tokenfile loading error: $! " );
         $Token = decode_json(<$TOKENFILE>) };
         close($TOKENFILE);
 
@@ -548,7 +549,7 @@ sub TadoAPI_NewTokenRequest {
         }
         else {
             #write token data in file
-            open( my $TOKENFILE, q{>}, $tokenFileName ) or die("ERROR: $!");
+            open( my $TOKENFILE, q{>}, $tokenFileName ) or croak( "Tokenfile writing error: $! " );
             print $TOKENFILE $returnData . "\n";
             close($TOKENFILE);
 
@@ -577,7 +578,7 @@ sub TadoAPI_TokenRefresh {
     # load token
     my $TOKENFILE;
     eval {
-    open( $TOKENFILE, q{<}, $tokenFileName ) or die("ERROR: $!");
+    open( $TOKENFILE, q{<}, $tokenFileName ) or croak( "Tokenfile loading for refresh error: $! " );
     $Token = decode_json(<$TOKENFILE>) };
     close($TOKENFILE);
 
@@ -623,7 +624,7 @@ sub TadoAPI_TokenRefresh {
         }
         else {
             #write token data in file
-            open( my $TOKENFILE, q{>}, $tokenFileName ) or die("ERROR: $!");
+            open( my $TOKENFILE, q{>}, $tokenFileName ) or croak( "Tokenfile refreshing (write) error: $! " );
             print $TOKENFILE $returnData . "\n";
             close($TOKENFILE);
 
@@ -1763,7 +1764,7 @@ sub TadoAPI_storePassword {
     my $key   = getUniqueId() . $index;
     my $e_pwd = "";
 
-    if ( eval { use Digest::MD5; 1 } ) {
+    if ( eval { require Digest::MD5; 1 } ) {
         $key = Digest::MD5::md5_hex( unpack "H*", $key );
         $key .= Digest::MD5::md5_hex($key);
     }
@@ -1798,7 +1799,7 @@ sub TadoAPI_readPassword {
     }
 
     if ( defined($password) ) {
-        if ( eval { use Digest::MD5; 1 } ) {
+        if ( eval { require Digest::MD5; 1 } ) {
             $key = Digest::MD5::md5_hex( unpack "H*", $key );
             $key .= Digest::MD5::md5_hex($key);
         }