Moved exception, added error