Replaced status checks with exception