diff --git a/lib/advent_of_code_cli/commands/example/solve.rb b/lib/advent_of_code_cli/commands/example/solve.rb
index de3326f..f37fb66 100644
--- a/lib/advent_of_code_cli/commands/example/solve.rb
+++ b/lib/advent_of_code_cli/commands/example/solve.rb
@@ -51,6 +51,8 @@ def solution(module_name, part, input)
           end
 
           say "Took #{end_time - start_time} seconds to solve"
+        rescue NotImplementedError
+          say "Part #{part} has not yet been implemented", :yellow
         end
 
         def expected_answers
diff --git a/lib/advent_of_code_cli/commands/solve.rb b/lib/advent_of_code_cli/commands/solve.rb
index 4f918ee..1af5308 100644
--- a/lib/advent_of_code_cli/commands/solve.rb
+++ b/lib/advent_of_code_cli/commands/solve.rb
@@ -33,6 +33,8 @@ def solution(module_name, part, input)
 
         say "Part #{part} result: #{result}"
         say "Took #{end_time - start_time} seconds to solve"
+      rescue NotImplementedError
+        say "Part #{part} has not yet been implemented", :yellow
       end
     end
   end