diff --git a/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java b/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java
index 6d7c462e591..6bf2dabfa9f 100644
--- a/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java
+++ b/Mage.Sets/src/mage/sets/magicorigins/TheGreatAurora.java
@@ -117,10 +117,12 @@ class TheGreatAuroraEffect extends OneShotEffect {
                     player.moveCards(player.getHand(), Zone.LIBRARY, source, game);
                     List<Permanent> list = permanentsOwned.remove(player.getId());
                     permanentsCount.put(playerId, handCards + (list != null ? list.size() : 0));
-                    for (Permanent permanent : list) {
-                        player.moveCardToLibraryWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD, true, true);
+                    if (list != null) {
+                        for (Permanent permanent : list) {
+                            player.moveCardToLibraryWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD, true, true);
+                        }
+                        player.shuffleLibrary(source, game);
                     }
-                    player.shuffleLibrary(source, game);
                 }
             }