diff --git a/Source/Source.API.php b/Source/Source.API.php
index 9d20882..0a735c2 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -274,6 +274,11 @@
 	# Start fixing and/or resolving issues
 	foreach( $t_fixed_bugs as $t_bug_id => $t_changeset ) {
 
+		# make sure the bug exists before processing
+		if ( !bug_exists( $t_bug_id ) ) {
+			continue;
+		}
+
 		# fake the history entries as the committer/author user ID
 		$t_user_id = null;
 		if ( $t_changeset->committer_id > 0 ) {