Updated to 1.0.4-5.

Added better way to check if bundle is nil (thanks to sbingner)