Added some error handling components for a cleaner handling in other
modules