Removed stupid try-catches.
Fixed merge conflicts.