Hotfix 05/07/12

General

 * Fixed several issues that would result in a crash.