added exception, fix module