Added error checking and self unloading