Added error handling for Drive plugin
Fixed various bugs