diff --git a/pom.xml b/pom.xml
index fad922c5db7a2a526b31153f0b033a27b277507c..e50da2574ab367b461531a1e381f8af0eb9d0a13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>es.uvigo.esei.daa</groupId>
 	<artifactId>example</artifactId>
 	<packaging>war</packaging>
-	<version>0.1.6</version>
+	<version>0.1.7</version>
 	<name>DAA Example</name>
 
 	<licenses>
diff --git a/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java b/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
index c3b9eb763aef9d71b7188f08e2fb93416393982a..e73ca5a3982321c37710a56230773b3b193d6ace 100644
--- a/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
+++ b/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
@@ -66,12 +66,16 @@ public class UsersDAO extends DAO {
 	 * @throws DAOException if an error happens while checking the credentials.
 	 */
 	public boolean checkLogin(String login, String password) throws DAOException {
-		final User user = this.get(login);
-		
-		final String dbPassword = user.getPassword();
-		final String shaPassword = encodeSha256(SALT + password);
-		
-		return shaPassword.equals(dbPassword);
+		try {
+			final User user = this.get(login);
+			
+			final String dbPassword = user.getPassword();
+			final String shaPassword = encodeSha256(SALT + password);
+			
+			return shaPassword.equals(dbPassword);
+		} catch (IllegalArgumentException iae) {
+			return false;
+		}
 	}
 	
 	private final static String encodeSha256(String text) {