Fixed compiler warning

That line of code should never happen but the complier doesn't
know that so just have a return statement to keep it happy.
Merging modules together