Fixed an issue with scheduling conflicts erroneously being thrown