diff --git a/BusinessLogicTier/Logic/JobManagement/JobManagementLogic.cs b/BusinessLogicTier/Logic/JobManagement/JobManagementLogic.cs
index 54c46116fca194cf1028cd9cab9b7830ff7b7023..8ef759d316a43c48cf7f7b146651de1e240f5d1c 100644
--- a/BusinessLogicTier/Logic/JobManagement/JobManagementLogic.cs
+++ b/BusinessLogicTier/Logic/JobManagement/JobManagementLogic.cs
@@ -90,7 +90,7 @@ namespace HaaSMiddleware.BusinessLogicTier.Logic.JobManagement {
         {
             log.Info("User " + loggedUser.GetLogIdentification() + " is deleting the job with info Id " + submittedJobInfoId);
             SubmittedJobInfo jobInfo = GetSubmittedJobInfoById(submittedJobInfoId, loggedUser);
-            if (jobInfo.State >= JobState.Finished)
+            if (jobInfo.State == JobState.Configuring || jobInfo.State >= JobState.Finished)
             {
                 #warning Renci SSH.NET bug - resolving paths when deleting symlink, use ssh delete instead
                 //FileSystemFactory.GetInstance(jobInfo.NodeType.FileTransferMethod.Protocol)
diff --git a/BusinessLogicTier/Logic/UserAndLimitationManagement/UserAndLimitationManagementLogic.cs b/BusinessLogicTier/Logic/UserAndLimitationManagement/UserAndLimitationManagementLogic.cs
index 4d591f5d183ccb42d1689f0a67c3ec23097faecd..f14741d4f3591f8eededcb6983a776b863d9a8d1 100644
--- a/BusinessLogicTier/Logic/UserAndLimitationManagement/UserAndLimitationManagementLogic.cs
+++ b/BusinessLogicTier/Logic/UserAndLimitationManagement/UserAndLimitationManagementLogic.cs
@@ -44,7 +44,11 @@ namespace HaaSMiddleware.BusinessLogicTier.Logic.UserAndLimitationManagement {
 			
 			// Get user 
 			AdaptorUser user = unitOfWork.AdaptorUserRepository.GetByName(credentials.Username);
-			if ( user.Deleted ) {
+            if (user == null) {
+                log.Error("Authentication of user " + credentials.Username + " was not successful due to wrong credentials.");
+                throw new InvalidAuthenticationCredentialsException("Authentication of user " + credentials.Username + " was not successful due to wrong credentials.");
+            }
+            if ( user.Deleted ) {
 				log.Error("User " + user.Username + " that requested authentication was already deleted from the system.");
 				throw new AuthenticatedUserAlreadyDeletedException("User " + user.Username + " that requested authentication was already deleted from the system.");
 			}