Add better exception handling for non existent components