Fixed non-return error.
Cleaned return value warnings.
Warning cleanup complete.