Moved to global instead of exception