diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
index 93933ae..a6a359a 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
@@ -217,8 +217,10 @@ public class BookController {
 		Book bookI = bookRepository.findByIsbn(book.getIsbn());
 
 		// If existing ISBN value is not attached to the current book...
-		if (bookI.getId() != book.getId()) {
-			bindingResult.rejectValue("isbn", "error.user", "ISBN code already exists");
+		if (bookI != null) {
+			if (bookI.getId() != book.getId()) {
+				bindingResult.rejectValue("isbn", "error.user", "ISBN code already exists");
+			}
 		}
 
 		if (bindingResult.hasErrors()) {